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

Add some PHP support for gettext and gd/freetype needed for zabbix 2.0

Browse Source
This commit is contained in:
Rob Vermaas 2012-12-01 21:17:50 +01:00
parent e9c35e9381
commit 86a5ad6d80
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng }: , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype }:
composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
@ -84,8 +84,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
}; };
gd = { gd = {
configureFlags = ["--with-gd=${gd}"]; configureFlags = ["--with-gd=${gd} --with-freetype-dir=${freetype}"];
buildInputs = [gd libpng libjpeg ]; buildInputs = [gd libpng libjpeg freetype];
}; };
soap = { soap = {
@ -105,6 +105,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
configureFlags = ["--enable-mbstring"]; configureFlags = ["--enable-mbstring"];
}; };
gettext = {
configureFlags = ["--with-gettext=${gettext}"];
buildInputs = [gettext];
};
/* /*
php is build within this derivation in order to add the xdebug lines to the php.ini. php is build within this derivation in order to add the xdebug lines to the php.ini.
So both Apache and command line php both use xdebug without having to configure anything. So both Apache and command line php both use xdebug without having to configure anything.

22
pkgs/development/interpreters/php/fix.patch
View File

@ -54,3 +54,25 @@
if test -z `$APXS -q SYSCONFDIR`; then if test -z `$APXS -q SYSCONFDIR`; then
APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ APACHE_HOOKS_INSTALL="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
diff -rc php-5.3.18/configure php-5.3.18-new/configure
*** php-5.3.18/configure 2012-10-17 18:29:10.000000000 +0200
--- php-5.3.18-new/configure 2012-11-13 05:36:24.730136551 +0100
***************
*** 45113,45121 ****
if test "$PHP_GETTEXT" != "no"; then
! for i in $PHP_GETTEXT /usr/local /usr; do
! test -r $i/include/libintl.h && GETTEXT_DIR=$i && break
! done
if test -z "$GETTEXT_DIR"; then
{ echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; }
--- 45113,45119 ----
if test "$PHP_GETTEXT" != "no"; then
! GETTEXT_DIR=$PHP_GETTEXT
if test -z "$GETTEXT_DIR"; then
{ echo "configure: error: Cannot locate header file libintl.h" 1>&2; exit 1; }