From f786614e7e2e46e7893ec18a0684ca4815ac014d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 13 May 2009 10:43:34 +0000
Subject: * PHP: build with an external, dynamically linked sqlite.  Otherwise 
  PHP builds an internal copy of sqlite, and we get into trouble when   other
 Apache modules use a dynamically linked sqlite.  For instance,   Subversion
 1.6 barfs with "(20014)Internal error: SQLite compiled for   3.6.12, but
 running with 3.3.7".

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

(limited to 'pkgs')

diff --git a/pkgs/development/interpreters/php_configurable/default.nix b/pkgs/development/interpreters/php_configurable/default.nix
index dc9aa0ddedd..b21902495da 100644
--- a/pkgs/development/interpreters/php_configurable/default.nix
+++ b/pkgs/development/interpreters/php_configurable/default.nix
@@ -1,4 +1,4 @@
-let version = "5.2.6"; in
+let version = "5.2.9"; in
 
 args: with args;
 
@@ -38,6 +38,11 @@ composableDerivation {} ( fixed : {
         buildInputs = [ libxml2 ];
       };
     
+      sqlite = {
+        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+        buildInputs = [ sqlite ];
+      };
+    
       postgresql = {
         configureFlags = ["--with-pgsql=${postgresql}"];
         buildInputs = [ postgresql ];
@@ -115,6 +120,7 @@ composableDerivation {} ( fixed : {
     curlSupport = true;
     gettextSupport = true;
     postgresqlSupport = true;
+    sqliteSupport = true;
     zlibSupport = true;
     opnesslSupport = true;
     xdebugSupport = true;
@@ -164,7 +170,7 @@ composableDerivation {} ( fixed : {
 
   src = args.fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    md5 = "7380ffecebd95c6edb317ef861229ebd";
+    md5 = "280d6cda7f72a4fc6de42fda21ac2db7";
     name = "php-${version}.tar.bz2";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03941cc9298..797a4692425 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2165,7 +2165,7 @@ let
     inherit
       stdenv fetchurl lib composableDerivation autoconf automake
       flex bison apacheHttpd mysql libxml2 # gettext
-      zlib curl gd postgresql openssl pkgconfig;
+      zlib curl gd postgresql openssl pkgconfig sqlite;
   };
 
   pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) {
-- 
cgit 1.4.1