public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pyqt5: move to qmakeHook

Browse Source 
This reverts commit f1c2572479265d121d55d9e3270dc1ebfee4aa00.
This commit is contained in:
Nikolay Amiantov 2016-04-16 22:59:17 +03:00
parent 79008f6095
commit c161258003
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/pyqt/5.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus { stdenv, fetchurl, python, pkgconfig, qtbase, qtsvg, qtwebkit, sip, pythonDBus
, lndir, makeWrapper }: , lndir, makeWrapper, qmakeHook }:
let let
version = "5.5.1"; version = "5.5.1";
@ -21,13 +21,12 @@ in stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python pkgconfig makeWrapper lndir python pkgconfig makeWrapper lndir
qtbase qtsvg qtwebkit qtbase qtsvg qtwebkit qmakeHook
]; ];
propagatedBuildInputs = [ sip ]; propagatedBuildInputs = [ sip ];
configurePhase = '' configurePhase = ''
runHook preConfigure
mkdir -p $out mkdir -p $out
lndir ${pythonDBus} $out lndir ${pythonDBus} $out
@ -45,7 +44,6 @@ in stdenv.mkDerivation {
--destdir=$out/lib/${python.libPrefix}/site-packages \ --destdir=$out/lib/${python.libPrefix}/site-packages \
--sipdir=$out/share/sip \ --sipdir=$out/share/sip \
--designer-plugindir=$out/plugins/designer --designer-plugindir=$out/plugins/designer
runHook postConfigure
''; '';
postInstall = '' postInstall = ''

3
pkgs/top-level/python-packages.nix
View File

@ -166,10 +166,9 @@ in modules // {
pythonPackages = self; 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; sip = self.sip_4_16;
pythonDBus = self.dbus; pythonDBus = self.dbus;
inherit (pkgs.qt55) qtbase qtsvg qtwebkit;
}; };
pyside = callPackage ../development/python-modules/pyside { }; pyside = callPackage ../development/python-modules/pyside { };