diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-16 08:56:08 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-16 08:59:31 +0100 |
| commit | 15a19994c91f32ed0cf1bb20f9c61cbb5043483d (patch) | |
| tree | b8addf800e9fba57786fdbcdb7bcfd8a0f9ad7d1 /pkgs | |
| parent | 3452f807d4b357f9e67456af1197d2e37cb996b6 (diff) | |
| download | nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar.gz nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar.bz2 nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar.lz nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar.xz nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.tar.zst nixlib-15a19994c91f32ed0cf1bb20f9c61cbb5043483d.zip | |
kde4(10).pykde4: fix build via downgrading sip and pyqt4
Cf. https://github.com/NixOS/nixpkgs/commit/501008ad6f742c40888ef2b9ddf983373cd8d38a#commitcomment-5080684
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/4.x.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/python-modules/sip/default.nix | 4 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index ab870492da61..92a5fd2dc07f 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: -stdenv.mkDerivation rec { - name = "PyQt-x11-gpl-4.10.3"; +let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3 +in +stdenv.mkDerivation { + name = "PyQt-x11-gpl-${version}"; src = fetchurl { - url = "mirror://sourceforge/pyqt/PyQt4/PyQt-4.10.3/PyQt-x11-gpl-4.10.3.tar.gz"; - sha256 = "0c7nifx3w0b9w1k0g9dvav1rv1lvd7awmq0zkqn3n8clyfzbw4x7"; + url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; + sha256 = "1zp69caqq195ymp911d0cka8619q78hzmfxvj7c51w2y53zg4z3l"; }; configurePhase = '' @@ -34,7 +36,7 @@ stdenv.mkDerivation rec { for i in $out/bin/*; do wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" done - ''; # */ + ''; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 72693a0b5d30..db397f959448 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "sip-4.15.4"; + name = "sip-4.14.7"; # kde410.pykde4 doesn't build with 4.15 src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "0a12lmqkf342yg42ygnjm1fyldcx9pzhy7z68p4ms4ydfcl78jsr"; + sha256 = "1dv1sdwfmnq481v80k2951amzs9s87d4qhk0hpwrhb1sllh92rh5"; }; configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' |