forked from mirrors/nixpkgs
* 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
This commit is contained in:
parent
57757bed7f
commit
f786614e7e
pkgs
|
@ -1,4 +1,4 @@
|
||||||
let version = "5.2.6"; in
|
let version = "5.2.9"; in
|
||||||
|
|
||||||
args: with args;
|
args: with args;
|
||||||
|
|
||||||
|
@ -38,6 +38,11 @@ composableDerivation {} ( fixed : {
|
||||||
buildInputs = [ libxml2 ];
|
buildInputs = [ libxml2 ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
sqlite = {
|
||||||
|
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
|
||||||
|
buildInputs = [ sqlite ];
|
||||||
|
};
|
||||||
|
|
||||||
postgresql = {
|
postgresql = {
|
||||||
configureFlags = ["--with-pgsql=${postgresql}"];
|
configureFlags = ["--with-pgsql=${postgresql}"];
|
||||||
buildInputs = [ postgresql ];
|
buildInputs = [ postgresql ];
|
||||||
|
@ -115,6 +120,7 @@ composableDerivation {} ( fixed : {
|
||||||
curlSupport = true;
|
curlSupport = true;
|
||||||
gettextSupport = true;
|
gettextSupport = true;
|
||||||
postgresqlSupport = true;
|
postgresqlSupport = true;
|
||||||
|
sqliteSupport = true;
|
||||||
zlibSupport = true;
|
zlibSupport = true;
|
||||||
opnesslSupport = true;
|
opnesslSupport = true;
|
||||||
xdebugSupport = true;
|
xdebugSupport = true;
|
||||||
|
@ -164,7 +170,7 @@ composableDerivation {} ( fixed : {
|
||||||
|
|
||||||
src = args.fetchurl {
|
src = args.fetchurl {
|
||||||
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
|
||||||
md5 = "7380ffecebd95c6edb317ef861229ebd";
|
md5 = "280d6cda7f72a4fc6de42fda21ac2db7";
|
||||||
name = "php-${version}.tar.bz2";
|
name = "php-${version}.tar.bz2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2165,7 +2165,7 @@ let
|
||||||
inherit
|
inherit
|
||||||
stdenv fetchurl lib composableDerivation autoconf automake
|
stdenv fetchurl lib composableDerivation autoconf automake
|
||||||
flex bison apacheHttpd mysql libxml2 # gettext
|
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) {
|
pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) {
|
||||||
|
|
Loading…
Reference in a new issue