From 488f36ef19b11be4c52d59eb713d64e6ce1a2c12 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 19 Jul 2010 23:24:37 +0000 Subject: * Apply a patch to make kdebindings build with the current sip. svn path=/nixpkgs/branches/x-updates/; revision=22670 --- pkgs/desktops/kde-4.4/bindings/builder.sh | 11 ----------- pkgs/desktops/kde-4.4/bindings/default.nix | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 pkgs/desktops/kde-4.4/bindings/builder.sh diff --git a/pkgs/desktops/kde-4.4/bindings/builder.sh b/pkgs/desktops/kde-4.4/bindings/builder.sh deleted file mode 100644 index e3f1df28b77c..000000000000 --- a/pkgs/desktops/kde-4.4/bindings/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -tar xfvj $src -cd kdebindings-*/python/pykde4 -python configure.py -d $out/lib/python2.5/site-packages -v $out/share/sip -for i in `find . -name Makefile` -do - sed -i -e "s/-O2/-O0/" $i -done -make -make install diff --git a/pkgs/desktops/kde-4.4/bindings/default.nix b/pkgs/desktops/kde-4.4/bindings/default.nix index d08b8de6ec64..0c3dfd8cf803 100644 --- a/pkgs/desktops/kde-4.4/bindings/default.nix +++ b/pkgs/desktops/kde-4.4/bindings/default.nix @@ -7,11 +7,18 @@ stdenv.mkDerivation { name = "kdebindings-4.4.5"; + src = fetchurl { url = mirror://kde/stable/4.4.5/src/kdebindings-4.4.5.tar.bz2; sha256 = "0l8lk8vl68jc82lai4ljlm9ph53q4fn0ki0jq45lizdmqjgvahy4"; }; - #builder = ./builder.sh; + + patches = + [ (fetchurl { + url = "http://bugs.gentoo.org/attachment.cgi?id=238975"; + sha256 = "0vng8j8fhbq5ys8hy0bcvi6x2bym9j65dh61m2c1dr3z7rsx2bqb"; + }) + ]; # Disable smoke because I don't need it and gives us an error cmakeFlags = [ "-DENABLE_SMOKE=OFF" ]; -- cgit 1.4.1