From 486e918215ccd643970e22e8874302fa5fe21561 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 12 Jun 2013 21:59:52 +0200 Subject: php: Fix support for JPEG and PNG over GD. Set an explicit path to the location of libjpeg for version 5.4 and an explicit path to libjpeg _and_ libpng for version 5.3. Signed-off-by: aszlig --- pkgs/development/interpreters/php/5.4.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/php/5.4.nix') diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 3c200f9c5c1..35b1f82c246 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -90,7 +90,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gd = { # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. - configureFlags = ["--with-gd --with-freetype-dir=${freetype} --with-png-dir=${libpng}"]; + configureFlags = [ + "--with-gd" + "--with-freetype-dir=${freetype}" + "--with-png-dir=${libpng}" + "--with-jpeg-dir=${libjpeg}" + ]; buildInputs = [ libpng libjpeg freetype ]; }; -- cgit 1.4.1