From 41223662333b367d4a9d45136a0471b18930690e Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 15 Feb 2008 11:12:56 +0000
Subject: [PATCH] added zlib support to PHP

svn path=/nixpkgs/trunk/; revision=10703
---
 pkgs/development/interpreters/php_configurable/default.nix | 3 ++-
 pkgs/top-level/all-packages.nix                            | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix
index 6b755066359b..d18a2cf2b056 100644
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@@ -411,6 +411,7 @@ args:
 
 # Extensions 
 
+          zlib          =     { cfgOption = "--with-zlib=${args.zlib}"; pass = "zlib"; };
 
           libxml2       =     { cfgOption = "--with-libxml-dir=\$libxml2";
                                 pass = { inherit (args) libxml2; }; 
@@ -459,7 +460,7 @@ args:
     };
 
   defaults = [ "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
-  optionals = [ "libxml2" "gettext" "postgresql"];
+  optionals = [ "libxml2" "gettext" "postgresql" "zlib"];
 
   # 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 270ba7d21981..d3912d7a8176 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1648,6 +1648,7 @@ rec {
    inherit fetchurl flex bison apacheHttpd mysql; # gettext;
    inherit libxml2;
    inherit postgresql;
+   inherit zlib;
    flags = [ "xdebug" "mysql" "mysqli" "pdo_mysql" "libxml2" "apxs2" ];
   };