using getConfig for php so that users who don't know the composableDerivation very well can switch off features.

svn path=/nixpkgs/trunk/; revision=17423
This commit is contained in:
Marc Weber 2009-09-25 19:39:05 +00:00
parent 213519d327
commit 931a5936cb
2 changed files with 18 additions and 18 deletions

View File

@ -114,23 +114,23 @@ composableDerivation {} ( fixed : {
}; };
cfg = { cfg = {
mysqlSupport = true; mysqlSupport = getConfig ["php" "mysql"] true;
mysqliSupport = true; mysqliSupport = getConfig ["php" "mysqli"] true;
pdo_mysqlSupport = true; pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
libxml2Support = true; libxml2Support = getConfig ["php" "libxml2"] true;
apxs2Support = true; apxs2Support = getConfig ["php" "apxs2"] true;
bcmathSupport = true; bcmathSupport = getConfig ["php" "bcmath"] true;
socketsSupport = true; socketsSupport = getConfig ["php" "sockets"] true;
curlSupport = true; curlSupport = getConfig ["php" "curl"] true;
gettextSupport = true; gettextSupport = getConfig ["php" "gettext"] true;
postgresqlSupport = true; postgresqlSupport = getConfig ["php" "postgresql"] true;
sqliteSupport = true; sqliteSupport = getConfig ["php" "sqlite"] true;
soapSupport = true; soapSupport = getConfig ["php" "soap"] true;
zlibSupport = true; zlibSupport = getConfig ["php" "zlib"] true;
opensslSupport = true; opensslSupport = getConfig ["php" "openssl"] true;
xdebugSupport = true; xdebugSupport = getConfig ["php" "xdebug"] true;
mbstringSupport = true; mbstringSupport = getConfig ["php" "mbstring"] true;
gdSupport = true; gdSupport = getConfig ["php" "gd"] true;
}; };
# only -O1 # only -O1

View File

@ -2262,7 +2262,7 @@ let
inherit inherit
stdenv fetchurl lib composableDerivation autoconf automake stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2 # gettext flex bison apacheHttpd mysql libxml2 # gettext
zlib curl gd postgresql openssl pkgconfig sqlite; zlib curl gd postgresql openssl pkgconfig sqlite getConfig;
}; };
pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) { pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) {