Author: viric
Date: Tue May 3 08:25:45 2011
New Revision: 27110
URL: https://svn.nixos.org/websvn/nix/?rev=27110&sc=1
Log:
Adding readline to php, so now 'php -a' works nicely with readline.
Modified:
nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix
nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix Tue May 3
08:18:42 2011 (r27109)
+++ nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix Tue May 3
08:25:45 2011 (r27110)
@@ -44,6 +44,11 @@
];
buildInputs = [ libxml2 ];
};
+
+ readline = {
+ configureFlags = ["--with-readline=${readline}"];
+ buildInputs = [ readline ];
+ };
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
@@ -126,6 +131,7 @@
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;
Modified: nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix Tue May 3
08:18:42 2011 (r27109)
+++ nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix Tue May 3
08:25:45 2011 (r27110)
@@ -45,6 +45,11 @@
buildInputs = [ libxml2 ];
};
+ readline = {
+ configureFlags = ["--with-readline=${readline}"];
+ buildInputs = [ readline ];
+ };
+
sqlite = {
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
buildInputs = [ sqlite ];
@@ -126,6 +131,7 @@
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;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 3 08:18:42
2011 (r27109)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 3 08:25:45
2011 (r27110)
@@ -2363,14 +2363,14 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
