diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-31 15:22:10 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-01-31 15:22:10 +0000 |
commit | b8a0ebe410a4bf6ff184fe5c7e6b3463c2899a8c (patch) | |
tree | c9dc0e6b934809843394cbfd42901aefc154c071 | |
parent | 0c6fa511b9bea85a9a061e6374b6c68555669630 (diff) |
* kdelibs 3.5.0.
* Make it detect bzip2; this is required for "meinproc". svn path=/nixpkgs/trunk/; revision=4641
-rw-r--r-- | pkgs/development/libraries/kde/kdelibs/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/kde/kdelibs/default.nix | 16 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 5 |
3 files changed, 21 insertions, 8 deletions
diff --git a/pkgs/development/libraries/kde/kdelibs/builder.sh b/pkgs/development/libraries/kde/kdelibs/builder.sh index aafa60e71b254..3122b0a82c2b0 100644 --- a/pkgs/development/libraries/kde/kdelibs/builder.sh +++ b/pkgs/development/libraries/kde/kdelibs/builder.sh @@ -1,3 +1,11 @@ +# Ugh, this should be factored out. +addInputsHook=addBzip2 +addBzip2() { + bzip2=$(type -tP bzip2) + test -n $bzip2 || fail + buildInputs="$(dirname $(dirname $bzip2)) $buildInputs" +} + source $stdenv/setup configureFlags="\ diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/development/libraries/kde/kdelibs/default.nix index b6e4a8760074f..334ad34151dc0 100644 --- a/pkgs/development/libraries/kde/kdelibs/default.nix +++ b/pkgs/development/libraries/kde/kdelibs/default.nix @@ -1,18 +1,20 @@ -{stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre, - pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat, - freetype}: +{ stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre +, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat +, freetype +}: stdenv.mkDerivation { - name = "kdelibs-3.4.3"; + name = "kdelibs-3.5.0"; builder = ./builder.sh; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.4.3.tar.bz2; - md5 = "0cd7c0c8a81e5d11b91b407a4aaaf3ff"; + url = ftp://ftp.kde.org/pub/kde/stable/3.5/src/kdelibs-3.5.0.tar.bz2; + md5 = "2b11d654e2ea1a3cd16dcfdcbb7d1915"; }; inherit openssl libX11 libjpeg; buildInputs = [ libX11 libXt libXext zlib perl qt openssl pcre - pkgconfig libjpeg libpng libtiff libxml2 libxslt expat libtool freetype + pkgconfig libjpeg libpng libtiff libxml2 libxslt expat + libtool freetype ]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index b53f639063395..03e245fcc2202 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -1023,7 +1023,10 @@ rec { }; kdelibs = import ../development/libraries/kde/kdelibs { - inherit fetchurl stdenv zlib perl openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt libtool expat freetype; + inherit + fetchurl stdenv zlib perl openssl pcre pkgconfig + libjpeg libpng libtiff libxml2 libxslt libtool + expat freetype; inherit (xlibs) libX11 libXt libXext; qt = qt3; }; |