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

pyqt4: update flags like in pyqt5

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-08-17 19:00:26 +03:00
parent 1d53115765
commit 4b2e1998bb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, makeWrapper }: { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
let let
version = "4.11.3"; version = "4.11.3";
inherit (pythonPackages) python dbus-python; inherit (pythonPackages) python dbus-python sip;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "${python.libPrefix}-PyQt-x11-gpl-${version}"; name = "${python.libPrefix}-PyQt-x11-gpl-${version}";
@ -22,16 +22,16 @@ in stdenv.mkDerivation {
configureFlagsArray=( \ configureFlagsArray=( \
--confirm-license --bindir $out/bin \ --confirm-license --bindir $out/bin \
--destdir $out/lib/${python.libPrefix}/site-packages \ --destdir $out/${python.sitePackages} \
--plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip \ --plugin-destdir $out/lib/qt4/plugins --sipdir $out/share/sip/PyQt4 \
--dbus=$out/include/dbus-1.0 --verbose) --dbus=${dbus_libs.dev}/include/dbus-1.0 --verbose)
${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}" ${python.executable} configure.py $configureFlags "''${configureFlagsArray[@]}"
''; '';
buildInputs = [ pkgconfig makeWrapper qt4 lndir ]; buildInputs = [ pkgconfig makeWrapper qt4 lndir dbus_libs ];
propagatedBuildInputs = [ pythonPackages.sip_4_16 python ]; propagatedBuildInputs = [ sip python ];
postInstall = '' postInstall = ''
for i in $out/bin/*; do for i in $out/bin/*; do