public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pyqt4: update to 4.10.3 and add python3 support 

also add python3 support for dbus-python
This commit is contained in:
Song Wenwu 2014-01-08 16:39:05 +08:00 committed by Rok Garbas
parent 98d2f7ea45
commit 501008ad6f
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/pyqt/default.nix → pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -1,14 +1,11 @@
{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "PyQt-x11-gpl-4.10.1"; name = "PyQt-x11-gpl-4.10.3";
src = fetchurl { src = fetchurl {
urls = [ url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz";
"http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz" sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7";
"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";
}; };
configurePhase = '' configurePhase = ''
@ -26,7 +23,7 @@ stdenv.mkDerivation rec {
--plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \ --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \
--dbus=$out/include/dbus-1.0 --verbose) --dbus=$out/include/dbus-1.0 --verbose)
python configure.py $configureFlags "''${configureFlagsArray[@]}" ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
''; '';
buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; buildInputs = [ python pkgconfig makeWrapper qt4 lndir ];

2
pkgs/top-level/all-packages.nix
View File

@ -6191,7 +6191,7 @@ let
sip = callPackage ../development/python-modules/sip { }; sip = callPackage ../development/python-modules/sip { };
pyqt4 = callPackage ../development/python-modules/pyqt { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
stdenv = if stdenv.isDarwin stdenv = if stdenv.isDarwin
then clangStdenv then clangStdenv
else stdenv; else stdenv;

12
pkgs/top-level/python-packages.nix
View File

@ -57,6 +57,11 @@ pythonPackages = modules // import ./python-packages-generated.nix {
blivet = callPackage ../development/python-modules/blivet { }; blivet = callPackage ../development/python-modules/blivet { };
dbus = import ../development/python-modules/dbus {
inherit (pkgs) stdenv fetchurl pkgconfig dbus dbus_glib dbus_tools;
inherit python;
};
ipython = import ../shells/ipython { ipython = import ../shells/ipython {
inherit (pkgs) stdenv fetchurl sip pyqt4; inherit (pkgs) stdenv fetchurl sip pyqt4;
inherit buildPythonPackage pythonPackages; inherit buildPythonPackage pythonPackages;
@ -121,6 +126,13 @@ pythonPackages = modules // import ./python-packages-generated.nix {
inherit python buildPythonPackage pygobject pycairo; inherit python buildPythonPackage pygobject pycairo;
}; };
pyqt4 = import ../development/python-modules/pyqt/4.x.nix {
inherit (pkgs) stdenv fetchurl pkgconfig qt4 makeWrapper;
inherit (pkgs.xorg) lndir;
inherit python sip;
pythonDBus = dbus;
};
sip = import ../development/python-modules/sip { sip = import ../development/python-modules/sip {
inherit (pkgs) stdenv fetchurl; inherit (pkgs) stdenv fetchurl;
inherit python; inherit python;