summary refs log tree commit diff
path: root/pkgs/development/interpreters/php/5.4.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-06-12 21:59:52 +0200
committeraszlig <aszlig@redmoonstudios.org>2013-06-14 17:50:35 +0200
commit486e918215ccd643970e22e8874302fa5fe21561 (patch)
tree7f8b0a51a884731beaeec296248b503590de7e6b /pkgs/development/interpreters/php/5.4.nix
parent672ae93687db5b95055351ba7660895038bf2bd1 (diff)
downloadnixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar.gz
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar.bz2
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar.lz
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar.xz
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.tar.zst
nixpkgs-486e918215ccd643970e22e8874302fa5fe21561.zip
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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/development/interpreters/php/5.4.nix')
-rw-r--r--pkgs/development/interpreters/php/5.4.nix7
1 files changed, 6 insertions, 1 deletions
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 ];
       };