From 9c5311251aa6ca9388cef07999ec604aae401812 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 8 Dec 2018 19:18:14 +0300 Subject: [PATCH] php: add option config.php.systemd --- pkgs/development/interpreters/php/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 03a235ae384..67ba470ac01 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -13,6 +13,7 @@ let { version , sha256 , extraPatches ? [] + , withSystemd ? config.php.systemd or stdenv.isLinux , imapSupport ? config.php.imap or (!stdenv.isDarwin) , ldapSupport ? config.php.ldap or true , mhashSupport ? config.php.mhash or true @@ -68,7 +69,7 @@ let nativeBuildInputs = [ pkgconfig autoconf ]; buildInputs = [ flex bison pcre ] - ++ optional stdenv.isLinux systemd + ++ optional withSystemd systemd ++ optionals imapSupport [ uwimap openssl pam ] ++ optionals curlSupport [ curl openssl ] ++ optionals ldapSupport [ openldap openssl ] @@ -105,7 +106,7 @@ let "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" ] ++ optional stdenv.isDarwin "--with-iconv=${libiconv}" - ++ optional stdenv.isLinux "--with-fpm-systemd" + ++ optional withSystemd "--with-fpm-systemd" ++ optionals imapSupport [ "--with-imap=${uwimap}" "--with-imap-ssl" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78aa59d48f2..daa1d12ffe6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7859,12 +7859,14 @@ in php71-unit = php71.override { config.php.embed = true; config.php.apxs2 = false; + config.php.systemd = false; config.php.fpm = false; }; php72-unit = php72.override { config.php.embed = true; config.php.apxs2 = false; + config.php.systemd = false; config.php.fpm = false; };