adding PHP. 5.3.2. See comments.

I had to add the newer PHP because current PHP 5.2.11 doesn't read SOAP
from https urls. Debian's PHP does work - I couldn't find their fix

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

1 files changed, 22 insertions, 8 deletions

diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix
index eb4a29dd720..af639a59e8c 100644
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@@ -1,10 +1,16 @@
-let version = "5.2.11"; in
-
 args: with args;
 
-let inherit (args.composableDerivation) composableDerivation edf wwf; in
+let
+
+  inherit (args.composableDerivation) composableDerivation edf wwf;
+
+in
+
+composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-composableDerivation {} ( fixed : {
+  # choose a different version this way:
+  # php.merge { version = "5.3.2"; }
+  version = "5.2.11";
 
   name = "php_configurable-${version}";
 
@@ -34,7 +40,10 @@ composableDerivation {} ( fixed : {
       };
 
       libxml2 = {
-        configureFlags = ["--with-libxml-dir=${libxml2}"];
+        configureFlags = [
+          "--with-libxml-dir=${libxml2}"
+          "--with-iconv-dir=${libiconv}"
+          ];
         buildInputs = [ libxml2 ];
       };
     
@@ -75,7 +84,7 @@ composableDerivation {} ( fixed : {
 
       gd = {
         configureFlags = ["--with-gd=${args.gd}"];
-        buildInputs = [gd];
+        buildInputs = [gd libpng libjpeg ];
       };
 
       soap = {
@@ -138,12 +147,17 @@ composableDerivation {} ( fixed : {
 
   installPhase = ''
     unset installPhase; installPhase;
-    cp php.ini-recommended $iniFile
+    cp php.ini-${ if builtins.lessThan (builtins.compareVersions version "5.3") 0
+        then "recommended" /* < PHP 5.3 */
+        else "production" /* >= PHP 5.3 */
+    } $iniFile
   '';
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    md5 = "286bf34630f5643c25ebcedfec5e0a09";
+    md5 = if version == "5.3.2" then "46f500816125202c48a458d0133254a4"
+          else if version == "5.2.11" then "286bf34630f5643c25ebcedfec5e0a09"
+          else throw "set md5 sum of php source file" ;
     name = "php-${version}.tar.bz2";
   };