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

* kdelibs 3.5.0.

Browse Source 
* Make it detect bzip2; this is required for "meinproc".

svn path=/nixpkgs/trunk/; revision=4641
This commit is contained in:
Eelco Dolstra 2006-01-31 15:22:10 +00:00
parent 0c6fa511b9
commit b8a0ebe410
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/kde/kdelibs/builder.sh
View File

@ -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 source $stdenv/setup
configureFlags="\ configureFlags="\

16
pkgs/development/libraries/kde/kdelibs/default.nix
View File

@ -1,18 +1,20 @@
{stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre, { stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre
pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat, , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
freetype}: , freetype
}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "kdelibs-3.4.3"; name = "kdelibs-3.5.0";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.4.3.tar.bz2; url = ftp://ftp.kde.org/pub/kde/stable/3.5/src/kdelibs-3.5.0.tar.bz2;
md5 = "0cd7c0c8a81e5d11b91b407a4aaaf3ff"; md5 = "2b11d654e2ea1a3cd16dcfdcbb7d1915";
}; };
inherit openssl libX11 libjpeg; inherit openssl libX11 libjpeg;
buildInputs = [ buildInputs = [
libX11 libXt libXext zlib perl qt openssl pcre 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
]; ];
} }

5
pkgs/system/all-packages-generic.nix
View File

@ -1023,7 +1023,10 @@ rec {
}; };
kdelibs = import ../development/libraries/kde/kdelibs { 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; inherit (xlibs) libX11 libXt libXext;
qt = qt3; qt = qt3;
}; };