diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-16 22:59:17 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:53 +0300 |
| commit | c161258003eee0d60618dd4bc39f543185f4517a (patch) | |
| tree | fc93a39c5c32f3647c9afdd9f42bcf11571e2ad0 /pkgs | |
| parent | 79008f6095acaa0b5d5e6c8af708d691e2c7adf8 (diff) | |
| download | nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar.gz nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar.bz2 nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar.lz nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar.xz nixlib-c161258003eee0d60618dd4bc39f543185f4517a.tar.zst nixlib-c161258003eee0d60618dd4bc39f543185f4517a.zip | |
pyqt5: move to qmakeHook
This reverts commit f1c2572479265d121d55d9e3270dc1ebfee4aa00.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index b11e87fe1d93..0e5f5604a988 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus -, lndir, makeWrapper }: +, lndir, makeWrapper, qmakeHook }: let version = "5.5.1"; @@ -21,13 +21,12 @@ in stdenv.mkDerivation { buildInputs = [ python pkgconfig makeWrapper lndir - qtbase qtsvg qtwebkit + qtbase qtsvg qtwebkit qmakeHook ]; propagatedBuildInputs = [ sip ]; configurePhase = '' - runHook preConfigure mkdir -p $out lndir ${pythonDBus} $out @@ -45,7 +44,6 @@ in stdenv.mkDerivation { --destdir=$out/lib/${python.libPrefix}/site-packages \ --sipdir=$out/share/sip \ --designer-plugindir=$out/plugins/designer - runHook postConfigure ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d1e2026a823..0771e4d1728d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -166,10 +166,9 @@ in modules // { pythonPackages = self; }; - pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { + pyqt5 = pkgs.qt55.callPackage ../development/python-modules/pyqt/5.x.nix { sip = self.sip_4_16; pythonDBus = self.dbus; - inherit (pkgs.qt55) qtbase qtsvg qtwebkit; }; pyside = callPackage ../development/python-modules/pyside { }; |