diff options
author | Shea Levy <shea@shealevy.com> | 2014-07-03 11:01:13 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-07-03 11:01:19 -0400 |
commit | a391b55b31989fc90360d76790b72934769b9287 (patch) | |
tree | 35a63f4392c33fb571da2fa768023db08aaeb83b | |
parent | 4277c05a88a616ba5cd94452a7d0d6905d0dc36b (diff) | |
download | nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar.gz nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar.bz2 nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar.lz nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar.xz nixpkgs-a391b55b31989fc90360d76790b72934769b9287.tar.zst nixpkgs-a391b55b31989fc90360d76790b72934769b9287.zip |
Use buildPecl for php-xcache
-rw-r--r-- | pkgs/development/libraries/php-xcache/default.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 28 |
3 files changed, 25 insertions, 38 deletions
diff --git a/pkgs/development/libraries/php-xcache/default.nix b/pkgs/development/libraries/php-xcache/default.nix deleted file mode 100644 index 5f175aa72ff..00000000000 --- a/pkgs/development/libraries/php-xcache/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, php, autoconf, automake, libtool, m4 }: - -stdenv.mkDerivation rec { - name = "php-xcache-3.0.1"; - - src = fetchurl { - url = http://xcache.lighttpd.net/pub/Releases/3.0.1/xcache-3.0.1.tar.bz2; - md5 = "45086010bc4f82f506c08be1c556941b"; - }; - - preConfigure = '' - phpize - - sed -i 's,^EXTENSION_DIR.*,'EXTENSION_DIR=$out/lib/php/extensions, configure - ''; - - configureFlags = [ - "--enable-xcache" - "--enable-xcache-coverager" - "--enable-xcache-optimizer" - "--enable-xcache-assembler" - "--enable-xcache-encoder" - "--enable-xcache-decoder" - ]; - - buildInputs = [ php autoconf automake libtool m4 ]; - - meta = { - description = "Fast, stable PHP opcode cacher"; - homepage = http://xcache.lighttpd.net/; - license = "BSD"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dbc08b9aeab..11d06f40e50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3540,8 +3540,6 @@ let php54 = callPackage ../development/interpreters/php/5.4.nix { }; - php_xcache = callPackage ../development/libraries/php-xcache { }; - 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 6695f9d3a93..1225021ad37 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -27,19 +27,19 @@ let self = with self; { buildInputs = [ pkgs.cyrus_sasl ]; }; - xdebug = buildPecl rec { + xdebug = buildPecl { name = "xdebug-2.2.5"; sha256 = "0vss35da615709kdvqji8pblckfvmabmj2njjjz6h8zzvj9gximd"; }; - apc = buildPecl rec { + apc = buildPecl { name = "apc-3.1.13"; sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; }; - zmq = buildPecl rec { + zmq = buildPecl { name = "zmq-1.1.2"; sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69"; @@ -50,4 +50,26 @@ let self = with self; { buildInputs = [ pkgs.pkgconfig ]; }; + + xcache = buildPecl rec { + name = "xcache-${version}"; + + version = "3.1.0"; + + src = pkgs.fetchurl { + url = "http://xcache.lighttpd.net/pub/Releases/${version}/${name}.tar.bz2"; + md5 = "e5816d47d52be200b959bf69a673ff74"; + }; + + configureFlags = [ + "--enable-xcache" + "--enable-xcache-coverager" + "--enable-xcache-optimizer" + "--enable-xcache-assembler" + "--enable-xcache-encoder" + "--enable-xcache-decoder" + ]; + + buildInputs = [ pkgs.m4 ]; + }; }; in self |