From e85b164df89292c2cbcb619c7617b378407b1200 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 25 Apr 2014 08:19:45 -0400 Subject: [PATCH] Add php 5.3 variant with fpm support --- pkgs/development/interpreters/php/5.3.nix | 5 +++++ pkgs/top-level/all-packages.nix | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index f7bb29270c7..95120a4d9a2 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -172,6 +172,10 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) ftp = { configureFlags = ["--enable-ftp"]; }; + + fpm = { + configureFlags = ["--enable-fpm"]; + }; }; cfg = { @@ -181,6 +185,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) curlSupport = config.php.curl or true; exifSupport = config.php.exif or true; ftpSupport = config.php.ftp or true; + fpmSupport = config.php.fpm or false; gdSupport = config.php.gd or true; gettextSupport = config.php.gettext or true; imapSupport = config.php.imap or false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2fed56c49fe..c7c5d62e2e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3397,6 +3397,15 @@ let php53 = callPackage ../development/interpreters/php/5.3.nix { }; + php_fpm53 = callPackage ../development/interpreters/php/5.3.nix { + config = config // { + php = (config.php or {}) // { + fpm = true; + apxs2 = false; + }; + }; + }; + php54 = callPackage ../development/interpreters/php/5.4.nix { }; php_apc = callPackage ../development/libraries/php-apc { };