summary refs log tree commit diff
path: root/pkgs/development/python-modules/pyqt
diff options
context:
space:
mode:
authorSong Wenwu <iyzsong@gmail.com>2014-01-08 16:39:05 +0800
committerRok Garbas <rok@garbas.si>2014-01-11 20:07:29 +0100
commit501008ad6f742c40888ef2b9ddf983373cd8d38a (patch)
tree9ece6f9d385d8e814e1ddaf9f17867eb47ac4744 /pkgs/development/python-modules/pyqt
parent98d2f7ea454fa09adfd16ac54bb90bd72eb9025c (diff)
downloadnixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar.gz
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar.bz2
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar.lz
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar.xz
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.tar.zst
nixlib-501008ad6f742c40888ef2b9ddf983373cd8d38a.zip
pyqt4: update to 4.10.3 and add python3 support
also add python3 support for dbus-python
Diffstat (limited to 'pkgs/development/python-modules/pyqt')
-rw-r--r--pkgs/development/python-modules/pyqt/4.x.nix (renamed from pkgs/development/python-modules/pyqt/default.nix)21
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 7d9679349e8e..ab870492da61 100644
--- a/pkgs/development/python-modules/pyqt/default.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,32 +1,29 @@
 { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "PyQt-x11-gpl-4.10.1";
-  
+  name = "PyQt-x11-gpl-4.10.3";
+
   src = fetchurl {
-    urls = [
-      "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"
-      "http://pkgs.fedoraproject.org/lookaside/pkgs/PyQt4/PyQt-x11-gpl-4.10.1.tar.gz/e5973c4ec0b0469f329bc00209d2ad9c/PyQt-x11-gpl-4.10.1.tar.gz"
-    ];
-    sha256 = "05psk23x6bc83hrkw7h88a14jxhvfbxms0c8yrdar8xqvkv8cdb2";
+    url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz";
+    sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7";
   };
-  
+
   configurePhase = ''
     mkdir -p $out
     lndir ${pythonDBus} $out
 
     export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages
-    
+
     substituteInPlace configure.py \
       --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'"
-  
+
     configureFlagsArray=( \
       --confirm-license --bindir $out/bin \
       --destdir $out/lib/${python.libPrefix}/site-packages \
       --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
       --dbus=$out/include/dbus-1.0 --verbose)
 
-    python configure.py $configureFlags "''${configureFlagsArray[@]}"
+    ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
   '';
 
   buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
   ''; # */
 
   enableParallelBuilding = true;
-  
+
   meta = {
     description = "Python bindings for Qt";
     license = "GPL";