From 99934eb36378d22d793cc86103544278a25922f6 Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Tue, 12 Feb 2013 21:23:24 +0100
Subject: [PATCH] php: Add zip and optional bz2 support

Use the overload bz2 = true to enable bz2 support for php.
zip support is enabled by default as it doesn't require any library.
---
 pkgs/development/interpreters/php/5.3.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 7d51a74020f..7a243e88971 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt }:
+, libxslt, libmcrypt, bzip2 }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -125,6 +125,15 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [libmcryptOverride];
       };
 
+      bz2 = {
+        configureFlags = ["--with-bz2=${bzip2}"];
+        buildInputs = [bzip2];
+      };
+
+      zip = {
+        configureFlags = ["--enable-zip"];
+      };
+
       /*
          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.
@@ -158,6 +167,8 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     gdSupport = config.php.gd or true;
     xslSupport = config.php.xsl or false;
     mcryptSupport = config.php.mcrypt or false;
+    bz2Support = config.php.bz2 or false;
+    zipSupport = config.php.zip or true;
   };
 
   configurePhase = ''