Merge branch 'master' into staging

2016-08-15 10:34:28 +03:00
parent ea34fe82bc 397a17aef9
commit 5b296a1470
121 changed files with 1115 additions and 948 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";