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

php: Fix support for JPEG and PNG over GD.

Browse Source 
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>
This commit is contained in:
aszlig 2013-06-12 21:59:52 +02:00
parent 672ae93687
commit 486e918215
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/interpreters/php/5.3.nix
View File

@ -89,7 +89,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
}; };
gd = { gd = {
configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"]; configureFlags = [
"--with-gd"
"--with-freetype-dir=${freetype}"
"--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}"
];
buildInputs = [gd libpng libjpeg freetype]; buildInputs = [gd libpng libjpeg freetype];
}; };

7
pkgs/development/interpreters/php/5.4.nix
View File

@ -90,7 +90,12 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
gd = { gd = {
# FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108. # 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 ]; buildInputs = [ libpng libjpeg freetype ];
}; };