qt5: rename qmakeHook to qmake

2017-06-02 10:40:19 -05:00
parent 3f3d33a078
commit 210f688802
65 changed files with 165 additions and 151 deletions
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
-, lndir, makeWrapper, qmakeHook }:
+, lndir, makeWrapper, qmake }:

 let
  version = "5.8.1";
@@ -21,9 +21,10 @@ in buildPythonPackage {
    sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
  };

+  nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
+
  buildInputs = [
-    pkgconfig makeWrapper lndir
-    qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook
+    lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
  ];

  propagatedBuildInputs = [ sip ];