summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2016-08-29 21:47:26 +0200
committerGitHub <noreply@github.com>2016-08-29 21:47:26 +0200
commit357fbe1ccf2e7270e433156056c866fddf0bd3c1 (patch)
tree2054137d3f895963b492f77e0c205da1f29e47a6 /pkgs
parent74ec94bfa2e57e2c0beeee0e469de58391d04a7b (diff)
parentaebabb987172f0d14ed7d38b4c9f87f73f097851 (diff)
downloadnixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar.gz
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar.bz2
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar.lz
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar.xz
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.tar.zst
nixlib-357fbe1ccf2e7270e433156056c866fddf0bd3c1.zip
Merge pull request #18080 from vbgl/qarte-3
qarte: 2.4.0 -> 3.2.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/video/qarte/default.nix16
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index f01f4ffd7f5c..40011e11b2d4 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,25 +1,23 @@
-{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }:
+{ stdenv, fetchbzr, python3, rtmpdump, makeWrapper }:
 
 let
-  inherit (pythonPackages) python pyqt4 sip;
+  pythonEnv = python3.withPackages (ps: with ps; [ 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 ];
+  buildInputs = [ makeWrapper pythonEnv ];
 
   installPhase = ''
     mkdir -p $out/bin
     mv qarte $out/bin/
     substituteInPlace $out/bin/qarte \
-      --replace '/usr/bin/python' "${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 PATH : "${rtmpdump}/bin"
 
     mkdir -p $out/share/man/man1/