pyqt5: move to qmakeHook

This reverts commit f1c2572479.
2016-04-16 22:59:17 +03:00
parent 79008f6095
commit c161258003
2 changed files with 3 additions and 6 deletions
--- 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 = ''