Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-16 07:54:01 +00:00
parent 1747d28e5a 888efed972
commit 33e1c78ae3
139 changed files with 1301 additions and 1116 deletions
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -40,7 +40,10 @@ stdenv.mkDerivation {

  enableParallelBuilding = true;

-  passthru.pythonPath = [];
+  passthru = {
+    pythonPath = [];
+    qt = qt4;
+  };

  meta = {
    description = "Python bindings for Qt";