forked from mirrors/nixpkgs
added php curl support
svn path=/nixpkgs/trunk/; revision=11446
This commit is contained in:
parent
9231ea99d9
commit
0b6e4828cc
|
@ -411,6 +411,7 @@ args:
|
||||||
|
|
||||||
# Extensions
|
# Extensions
|
||||||
|
|
||||||
|
curl = { cfgOption = [ "--with-curl=${args.curl}" "--with-curlwrappers"]; pass = "curl";};
|
||||||
zlib = { cfgOption = "--with-zlib=${args.zlib}"; pass = "zlib"; };
|
zlib = { cfgOption = "--with-zlib=${args.zlib}"; pass = "zlib"; };
|
||||||
|
|
||||||
libxml2 = { cfgOption = "--with-libxml-dir=\$libxml2";
|
libxml2 = { cfgOption = "--with-libxml-dir=\$libxml2";
|
||||||
|
@ -491,18 +492,18 @@ args:
|
||||||
./configure --prefix=$out
|
./configure --prefix=$out
|
||||||
make
|
make
|
||||||
ensureDir $out/lib; cp modules/xdebug.so $out/lib
|
ensureDir $out/lib; cp modules/xdebug.so $out/lib
|
||||||
cat >> $iniFile << EOF
|
cat >> $iniFile << EOF
|
||||||
zend_extension="$out/lib/xdebug.so"
|
zend_extension="$out/lib/xdebug.so"
|
||||||
zend_extension_ts="$out/lib/xdebug.so"
|
zend_extension_ts="$out/lib/xdebug.so"
|
||||||
zend_extension_debug="$out/lib/xdebug.so"
|
zend_extension_debug="$out/lib/xdebug.so"
|
||||||
xdebug.remote_enable=true
|
xdebug.remote_enable=true
|
||||||
xdebug.remote_host=127.0.0.1
|
xdebug.remote_host=127.0.0.1
|
||||||
xdebug.remote_port=9000
|
xdebug.remote_port=9000
|
||||||
xdebug.remote_handler=dbgp
|
xdebug.remote_handler=dbgp
|
||||||
xdebug.profiler_enable=0
|
xdebug.profiler_enable=0
|
||||||
xdebug.profiler_output_dir="/tmp/xdebug"
|
xdebug.profiler_output_dir="/tmp/xdebug"
|
||||||
xdebug.remote_mode=req
|
xdebug.remote_mode=req
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
|
@ -1722,13 +1722,13 @@ let pkgs = rec {
|
||||||
# optional features
|
# optional features
|
||||||
inherit fetchurl flex bison apacheHttpd mysql libxml2; # gettext;
|
inherit fetchurl flex bison apacheHttpd mysql libxml2; # gettext;
|
||||||
inherit zlib;
|
inherit zlib;
|
||||||
flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
|
flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" "curl" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
python = python24;
|
python = python24;
|
||||||
|
|
||||||
python24 = import ../development/interpreters/python/2.4 {
|
python24 = import ../development/interpreters/python/2.4 {
|
||||||
inherit fetchurl stdenv zlib bzip2;
|
inherit fetchurl stdenv zlib bzip2;
|
||||||
};
|
};
|
||||||
|
|
||||||
python25 = import ../development/interpreters/python/2.5 {
|
python25 = import ../development/interpreters/python/2.5 {
|
||||||
|
|
Loading…
Reference in a new issue