diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:37:20 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-14 12:38:01 +0200 |
commit | 6842a24b21dcc49a5ed485f6ffde14e69e430adb (patch) | |
tree | 4c56223bd954bcf84d41d81227b3d627c2160c8f /pkgs/applications | |
parent | 4b2120f5b895e133b3c991bd01ba28e6d1698311 (diff) |
Remove top-level pyqt4
See #11567.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/picard/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pybitmessage/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/video/qarte/default.nix | 7 |
3 files changed, 14 insertions, 11 deletions
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2373bbc549d57..046789119ec67 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,10 +1,10 @@ -{ stdenv, buildPythonApplication, fetchurl, gettext +{ stdenv, pythonPackages, fetchurl, gettext , pkgconfig, libofa, ffmpeg, chromaprint -, pyqt4, mutagen, python-libdiscid }: -let version = "1.3.2"; in -buildPythonApplication { +let + version = "1.3.2"; +in pythonPackages.buildPythonApplication { name = "picard-${version}"; namePrefix = ""; @@ -20,10 +20,10 @@ buildPythonApplication { gettext ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPackages; [ pyqt4 mutagen - python-libdiscid + discid ]; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 703447594edb8..9675b5d5315a6 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }: +{ stdenv, fetchFromGitHub, pythonPackages, openssl }: stdenv.mkDerivation rec { name = "pybitmessage-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax"; }; - buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ]; + buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ]; preConfigure = '' substituteInPlace Makefile \ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/pybitmessage \ - --replace "exec python2" "exec ${python}/bin/python" \ + --replace "exec python2" "exec ${pythonPackages.python}/bin/python" \ --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" wrapProgram $out/bin/pybitmessage \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index d4221e8f57eb1..b7da48ef000c6 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }: +{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }: -stdenv.mkDerivation { +let + inherit (pythonPackages) python pyqt4; + sip = pythonPackages.sip_4_16; +in stdenv.mkDerivation { name = "qarte-2.4.0"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk; |