diff options
Diffstat (limited to 'pkgs/development/python-modules/pyqt/default.nix')
-rw-r--r-- | pkgs/development/python-modules/pyqt/default.nix | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index b5ec01a52d5de..5097e95f7e43d 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -1,39 +1,42 @@ -{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: +{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: stdenv.mkDerivation rec { - name = "PyQt-x11-gpl-4.8.1"; + name = "PyQt-x11-gpl-4.8.5"; src = fetchurl { - url = "http://nixos.org/tarballs/${name}.tar.gz"; - sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz"; + url = "http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz"; + sha256 = "0838nfis6xj92n4gccih7j14yigfm3x7p59yr7qa5jy75wxdzqn9"; }; - preConfigure = '' - ensureDir $out + 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) - ''; - configureScript="./configure.py"; - - configurePhase = '' - runHook preConfigure python configure.py $configureFlags "''${configureFlagsArray[@]}" - runHook postConfigure''; - - propagatedBuildInputs = [ python sip qt4 ] - ++ pythonDBus.propagatedBuildNativeInputs; - buildInputs = [ pkgconfig makeWrapper lndir ]; + ''; + + buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; + + propagatedBuildInputs = [ sip ]; postInstall = '' for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done''; + done + ''; # */ + + enableParallelBuilding = true; meta = { description = "Python bindings for Qt"; |