moving xdebug into its own package. This means you have to specify an additional php.ini file to make php debugger work for command line php.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a954bfad17c7..11d72ab6fec7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2339,13 +2339,21 @@ let
       if stdenv.isDarwin then null else unixODBC;
   };
 
-  php = import ../development/interpreters/php_configurable {
+  php = makeOverridable (import ../development/interpreters/php_configurable) {
     inherit
       stdenv fetchurl lib composableDerivation autoconf automake
       flex bison apacheHttpd mysql libxml2 # gettext
       zlib curl gd postgresql openssl pkgconfig sqlite getConfig;
   };
 
+  phpXdebug = import ../development/interpreters/php-xdebug {
+    inherit stdenv fetchurl php autoconf automake;
+  };
+
+  phpIniBuilder = makeOverridable (import ../development/interpreters/php/ini-bulider.nix) {
+    inherit php runCommand;
+  };
+
   pltScheme = builderDefsPackage (import ../development/interpreters/plt-scheme) {
     inherit cairo fontconfig freetype libjpeg libpng openssl
       perl mesa zlib which;