diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-05 10:00:23 +0000 |
| commit | 57fd764a391a6215165c377e1936204f297905c9 (patch) | |
| tree | e93f78b2cb4718187f5b693e3655499ee6ba485a /pkgs/desktops | |
| parent | a88fdf8ef7cd09efb795b2b3a7e41ec95bdc457f (diff) | |
| parent | e657e2c455d17fddd6d79eb93a1d08836a2e2b28 (diff) | |
| download | nixlib-57fd764a391a6215165c377e1936204f297905c9.tar nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.gz nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.bz2 nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.lz nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.xz nixlib-57fd764a391a6215165c377e1936204f297905c9.tar.zst nixlib-57fd764a391a6215165c377e1936204f297905c9.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/kde-3/kdelibs/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/desktops/kde-3/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix index 0f3494c05811..2c9e8e3563a8 100644 --- a/pkgs/desktops/kde-3/kdelibs/default.nix +++ b/pkgs/desktops/kde-3/kdelibs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibs, zlib, perl, qt3, openssl, pcre -, pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat +, pkgconfig, libtiff, libxml2, libxslt, libtool, expat , freetype, bzip2, cups, attr, acl }: @@ -22,10 +22,8 @@ stdenv.mkDerivation { ./kdelibs-3.5.10-openssl_1.0.0.patch ]; - passthru = {inherit openssl libjpeg qt3; inherit (xlibs) libX11;}; - buildInputs = [ - zlib perl qt3 openssl pcre pkgconfig libjpeg libpng libtiff libxml2 + zlib perl qt3 openssl pcre pkgconfig libtiff libxml2 libxslt expat libtool freetype bzip2 cups xlibs.libX11 xlibs.libXt xlibs.libXext xlibs.libXrender xlibs.libXft ]; @@ -45,7 +43,6 @@ stdenv.mkDerivation { configureFlags = '' --without-arts --with-ssl-dir=${openssl} - --with-extra-includes=${libjpeg}/include --x-includes=${xlibs.libX11}/include --x-libraries=${xlibs.libX11}/lib ''; |