From 58738e4bc7df7c5d7c224f71defec88f72775e02 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 24 Aug 2016 19:16:30 +0200 Subject: [PATCH 1/2] qarte: 2.4.0 -> 3.2.0 --- pkgs/applications/video/qarte/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index f01f4ffd7f5..5b87fca9dcd 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }: +{ stdenv, fetchbzr, python3Packages, rtmpdump, makeWrapper }: let - inherit (pythonPackages) python pyqt4 sip; + inherit (python3Packages) python pyqt5 sip; in stdenv.mkDerivation { - name = "qarte-2.4.0"; + name = "qarte-3.2.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; - rev = "150"; - sha256 = "0fj11jx9l5qi968c906rrksdic7w4yj414m47k6axlb4v6ghdnar"; + url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; + rev = "146"; + sha256 = "0dvl38dknmnj2p4yr25p88kw3mh502c6qdp2bd43bhd2sqc3b0v0"; }; buildInputs = [ makeWrapper ]; @@ -16,10 +16,10 @@ in stdenv.mkDerivation { mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ - --replace '/usr/bin/python' "${python.interpreter}" \ + --replace '/usr/bin/python3' "${python.interpreter}" \ --replace '/usr/share' "$out/share" wrapProgram $out/bin/qarte \ - --prefix PYTHONPATH : "${pyqt4}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ + --prefix PYTHONPATH : "${pyqt5}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ --prefix PATH : "${rtmpdump}/bin" mkdir -p $out/share/man/man1/ From aebabb987172f0d14ed7d38b4c9f87f73f097851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 29 Aug 2016 12:31:59 +0200 Subject: [PATCH 2/2] qarte: create python env --- pkgs/applications/video/qarte/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 5b87fca9dcd..40011e11b2d 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchbzr, python3Packages, rtmpdump, makeWrapper }: +{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }: let - inherit (python3Packages) python pyqt5 sip; + pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { name = "qarte-3.2.0"; src = fetchbzr { @@ -10,16 +10,14 @@ in stdenv.mkDerivation { sha256 = "0dvl38dknmnj2p4yr25p88kw3mh502c6qdp2bd43bhd2sqc3b0v0"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper pythonEnv ]; installPhase = '' mkdir -p $out/bin mv qarte $out/bin/ substituteInPlace $out/bin/qarte \ - --replace '/usr/bin/python3' "${python.interpreter}" \ --replace '/usr/share' "$out/share" wrapProgram $out/bin/qarte \ - --prefix PYTHONPATH : "${pyqt5}/lib/${python.libPrefix}/site-packages:${sip}/lib/${python.libPrefix}/site-packages" \ --prefix PATH : "${rtmpdump}/bin" mkdir -p $out/share/man/man1/