PHP now with postgresql support

svn path=/nixpkgs/trunk/; revision=10510

2 files changed, 4 insertions, 1 deletions

diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix
index 35583c9d37e9..6b755066359b 100644
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@@ -418,6 +418,8 @@ args:
           no_libxml2    =     { cfgOption =  "--disable-libxml";
                               };
 
+          postgresql   =      { cfgOption = "--with-pgsql=\$postgresql";
+                                pass = { inherit (args) postgresql;}; };
           mysql        =      { cfgOption = "--with-mysql=\$mysql";
                                 pass = { inherit (args) mysql;}; };
 
@@ -457,7 +459,7 @@ args:
     };
 
   defaults = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
-  optionals = [ "libxml2" "gettext" ];
+  optionals = [ "libxml2" "gettext" "postgresql"];
 
   # Don't konw wether they should be default.. I use them - Marc
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af909f6661f3..dd2ee70f25fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1386,6 +1386,7 @@ rec {
    # optional features
    inherit fetchurl flex bison apacheHttpd mysql; # gettext;
    inherit libxml2;
+   inherit postgresql;
    flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
   };