From 1f9005a3f6bb6586c809e0feb71a5b39e5690499 Mon Sep 17 00:00:00 2001
From: "Jason \\\"Don\\\" O'Conal" <lovek323@gmail.com>
Date: Mon, 24 Jun 2013 14:32:02 +0200
Subject: [PATCH] php53: add imap option

---
 pkgs/development/interpreters/php/5.3.nix | 21 ++++++++-------------
 pkgs/tools/networking/uwimap/default.nix  |  4 +++-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 347a374ffcc..d879a611c2a 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
 , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt
-, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv }:
+, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap
+, pam }:
 
 let
   libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
@@ -132,6 +133,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
         buildInputs = [gettext];
       };
 
+      imap = {
+        configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ];
+        buildInputs = [ uwimap openssl pam ];
+      };
+
       intl = {
         configureFlags = ["--enable-intl"];
         buildInputs = [icu];
@@ -163,18 +169,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       ftp = {
         configureFlags = ["--enable-ftp"];
       };
-
-      /*
-         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.
-         Xdebug could be put in its own derivation.
-      * /
-        meta = {
-                description = "debugging support for PHP";
-                homepage = http://xdebug.org;
-                license = "based on the PHP license - as is";
-                };
-      */
     };
 
   cfg = {
@@ -186,6 +180,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     ftpSupport = config.php.ftp or true;
     gdSupport = config.php.gd or true;
     gettextSupport = config.php.gettext or true;
+    imapSupport = config.php.imap or false;
     intlSupport = config.php.intl or true;
     libxml2Support = config.php.libxml2 or true;
     mbstringSupport = config.php.mbstring or true;
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 8c8c0241204..be3153ba281 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation {
     sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
   };
 
-  makeFlags = "lnp"; # Linux with PAM modules
+  makeFlags = "lnp" # Linux with PAM modules
+    # -fPIC is required to compile php with imap on x86_64 systems
+    + stdenv.lib.optionalString stdenv.isx86_64 " EXTRACFLAGS=-fPIC";
 
   buildInputs = [ pam openssl ];