From 32f5773017db9cfff3c2b14ee80ffa5c7204b03f Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Sat, 12 Nov 2005 22:07:14 +0000 Subject: [PATCH] Pass extra includes to kdelibs svn path=/nixpkgs/trunk/; revision=4275 --- pkgs/development/libraries/kde/kdelibs/builder.sh | 1 + pkgs/development/libraries/kde/kdelibs/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde/kdelibs/builder.sh b/pkgs/development/libraries/kde/kdelibs/builder.sh index 353ee12d6ee..0ab69c5c040 100644 --- a/pkgs/development/libraries/kde/kdelibs/builder.sh +++ b/pkgs/development/libraries/kde/kdelibs/builder.sh @@ -3,6 +3,7 @@ source $stdenv/setup configureFlags="\ --without-arts \ --with-ssl-dir=$openssl \ + --with-extra-includes=$libjpeg \ --x-includes=$libX11/include \ --x-libraries=$libX11/lib" diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/development/libraries/kde/kdelibs/default.nix index 98169bf01f1..546a50fad9b 100644 --- a/pkgs/development/libraries/kde/kdelibs/default.nix +++ b/pkgs/development/libraries/kde/kdelibs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { md5 = "0cd7c0c8a81e5d11b91b407a4aaaf3ff"; }; - inherit openssl libX11; + inherit openssl libX11 libjpeg; buildInputs = [ libX11 libXt libXext zlib perl qt openssl pcre pkgconfig libjpeg libpng libtiff libxml2 libxslt expat libtool freetype