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

kde4(10).pykde4: fix build via downgrading sip and pyqt4

Browse Source 
Cf. 501008ad6f (commitcomment-5080684)
This commit is contained in:
Vladimír Čunát 2014-01-16 08:56:08 +01:00
parent 3452f807d4
commit 15a19994c9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,13 @@
{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }:
stdenv.mkDerivation rec { let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3
name = "PyQt-x11-gpl-4.10.3"; in
stdenv.mkDerivation {
name = "PyQt-x11-gpl-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz"; url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz";
sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7"; sha256 = "1zp69caqq195ymp911d0cka8619q78hzmfxvj7c51w2y53zg4z3l";
}; };
configurePhase = '' configurePhase = ''
@ -34,7 +36,7 @@ stdenv.mkDerivation rec {
for i in $out/bin/*; do for i in $out/bin/*; do
wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH"
done done
''; # */ '';
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/development/python-modules/sip/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }: { stdenv, fetchurl, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sip-4.15.4"; name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
sha256 = "0a12lmqkf342yg42ygnjm1fyldcx9pzhy7z68p4ms4ydfcl78jsr"; sha256 = "1dv1sdwfmnq481v80k2951amzs9s87d4qhk0hpwrhb1sllh92rh5";
}; };
configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' configurePhase = stdenv.lib.optionalString stdenv.isDarwin ''