diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix deleted file mode 100644 index 99c5ad663af4..000000000000 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, php, autoconf, automake }: - -stdenv.mkDerivation rec { - version = "2.2.3"; - name = "php-xdebug-${version}"; - - src = fetchurl { - url = "http://xdebug.org/files/xdebug-2.2.3.tgz"; - sha256 = "076px4ax3qcqr3mmhi9jjkfhn7pcymrpda4hzy6kgn3flhnqfldk"; - }; - - buildInputs = [ php autoconf automake ]; - - configurePhase = '' - phpize - ./configure --prefix=$out - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # looks for this file for some reason -- isn't needed - touch unix.h - ''; - - buildPhase = '' - make && make test - ''; - - installPhase = '' - mkdir -p $out/lib/xdebug - cp modules/xdebug.so $out/lib - cp LICENSE $out/lib/xdebug - ''; - - meta = { - description = "PHP debugger and profiler extension"; - homepage = http://xdebug.org/; - license = "xdebug"; # based on PHP-3 - maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bffa3c288034..412dcb3ed2e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3438,14 +3438,6 @@ let php_xcache = callPackage ../development/libraries/php-xcache { }; - phpXdebug_5_3 = lowPrio (callPackage ../development/interpreters/php-xdebug { - php = php53; - }); - - phpXdebug_5_4 = callPackage ../development/interpreters/php-xdebug { }; - - phpXdebug = phpXdebug_5_4; - picolisp = callPackage ../development/interpreters/picolisp {}; pltScheme = racket; # just to be sure diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 654a071a182b..7ee050314049 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -32,4 +32,12 @@ let self = with self; { buildInputs = [ pkgs.cyrus_sasl ]; }; + + xdebug = buildPecl rec { + name = "xdebug-2.2.5"; + src = pkgs.fetchurl { + url = "http://pecl.php.net/get/${name}.tgz"; + sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; + }; + }; }; in self