summary refs log tree commit diff
path: root/pkgs/development/python-modules
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-08-15 10:34:28 +0300
committerNikolay Amiantov <ab@fmap.me>2016-08-15 10:34:28 +0300
commit5b296a147066bfaa652b37aaa88751e1955df9c9 (patch)
tree2e35a89f30ce3d2667f3d765f3a2835caea80b1c /pkgs/development/python-modules
parentea34fe82bced57d11127d4c23e5a5ade9fa56334 (diff)
parent397a17aef9e6c213cc2b3adc2c2ca3db76b213cb (diff)
downloadnixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar.gz
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar.bz2
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar.lz
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar.xz
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.tar.zst
nixlib-5b296a147066bfaa652b37aaa88751e1955df9c9.zip
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r--pkgs/development/python-modules/pyqt/4.x.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 746cc747d72d..ead5c4ffe9d2 100644
--- 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";