Merge pull request #31357 from ttuegel/qt-5-tmp

Qt 5: revert 5.9.2; remove build temporary directory
2017-11-08 16:06:38 -06:00
parent 94efde5119 a8538307e5
commit 094d088135
106 changed files with 3269 additions and 2152 deletions
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -45,7 +45,6 @@ in buildPythonPackage {
    ${python.executable} configure.py  -w \
      --confirm-license \
      --dbus=${dbus_libs.dev}/include/dbus-1.0 \
-      --qmake=$QMAKE \
      --no-qml-plugin \
      --bindir=$out/bin \
      --destdir=$out/${python.sitePackages} \