philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Adding readline to php, so now 'php -a' works nicely with readline.

Browse source 
svn path=/nixpkgs/trunk/; revision=27110
This commit is contained in:
Lluís Batlle i Rossell 2011-05-03 08:25:45 +00:00
parent 26da7d3871
commit 590bf722b4
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/interpreters/php/5.2.nix
View file

@ -44,6 +44,11 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
];
buildInputs = [ libxml2 ];
};
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
@ -126,6 +131,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
curlSupport = getConfig ["php" "curl"] true;
gettextSupport = getConfig ["php" "gettext"] true;
postgresqlSupport = getConfig ["php" "postgresql"] true;
readlineSupport = getConfig ["php" "readline"] true;
sqliteSupport = getConfig ["php" "sqlite"] true;
soapSupport = getConfig ["php" "soap"] true;
zlibSupport = getConfig ["php" "zlib"] true;

6
pkgs/development/interpreters/php/5.3.nix
View file

@ -45,6 +45,11 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
buildInputs = [ libxml2 ];
};
readline = {
configureFlags = ["--with-readline=${readline}"];
buildInputs = [ readline ];
};
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
@ -126,6 +131,7 @@ composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
curlSupport = getConfig ["php" "curl"] true;
gettextSupport = getConfig ["php" "gettext"] true;
postgresqlSupport = getConfig ["php" "postgresql"] true;
readlineSupport = getConfig ["php" "readline"] true;
sqliteSupport = getConfig ["php" "sqlite"] true;
soapSupport = getConfig ["php" "soap"] true;
zlibSupport = getConfig ["php" "zlib"] true;

4
pkgs/top-level/all-packages.nix
View file

@ -2363,14 +2363,14 @@ let
php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2
flex bison apacheHttpd mysql libxml2 readline
zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng;
};
php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2
flex bison apacheHttpd mysql libxml2 readline
zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv libjpeg libpng;
};