diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-14 12:02:12 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-14 12:02:28 +0200 |
| commit | 4fbb37c5179915a0daf985c624ab02373111cdcb (patch) | |
| tree | 9adede5ca986450956a6a23aede277d9dd8837d6 /pkgs/development/python-modules | |
| parent | 4bceaca196cd6be14a584be45510ca85f873ffe7 (diff) | |
| parent | 329589c7fdfac2a07af70dc8a3a281ddfc10b315 (diff) | |
| download | nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar.gz nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar.bz2 nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar.lz nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar.xz nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.tar.zst nixlib-4fbb37c5179915a0daf985c624ab02373111cdcb.zip | |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1287298
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/4.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index b2d5b93d9f78..746cc747d72d 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -28,9 +28,9 @@ stdenv.mkDerivation { ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ''; - buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; + buildInputs = [ pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ pythonPackages.sip_4_16 ]; + propagatedBuildInputs = [ pythonPackages.sip_4_16 python ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 7ec89ffd7eec..69fb6e266ea5 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -20,11 +20,11 @@ in stdenv.mkDerivation { }; buildInputs = [ - python pkgconfig makeWrapper lndir + pkgconfig makeWrapper lndir qtbase qtsvg qtwebkit qmakeHook ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ sip python ]; configurePhase = '' runHook preConfigure |