public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php: add option config.php.systemd

This commit is contained in:
Izorkin 2018-12-08 19:18:14 +03:00
parent 35eb1c21dc
commit 9c5311251a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/php/default.nix
View File

@ -13,6 +13,7 @@ let
{ version { version
, sha256 , sha256
, extraPatches ? [] , extraPatches ? []
, withSystemd ? config.php.systemd or stdenv.isLinux
, imapSupport ? config.php.imap or (!stdenv.isDarwin) , imapSupport ? config.php.imap or (!stdenv.isDarwin)
, ldapSupport ? config.php.ldap or true , ldapSupport ? config.php.ldap or true
, mhashSupport ? config.php.mhash or true , mhashSupport ? config.php.mhash or true
@ -68,7 +69,7 @@ let
nativeBuildInputs = [ pkgconfig autoconf ]; nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs = [ flex bison pcre ] buildInputs = [ flex bison pcre ]
++ optional stdenv.isLinux systemd ++ optional withSystemd systemd
++ optionals imapSupport [ uwimap openssl pam ] ++ optionals imapSupport [ uwimap openssl pam ]
++ optionals curlSupport [ curl openssl ] ++ optionals curlSupport [ curl openssl ]
++ optionals ldapSupport [ openldap openssl ] ++ optionals ldapSupport [ openldap openssl ]
@ -105,7 +106,7 @@ let
"--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}" "--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
] ]
++ optional stdenv.isDarwin "--with-iconv=${libiconv}" ++ optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ optional stdenv.isLinux "--with-fpm-systemd" ++ optional withSystemd "--with-fpm-systemd"
++ optionals imapSupport [ ++ optionals imapSupport [
"--with-imap=${uwimap}" "--with-imap=${uwimap}"
"--with-imap-ssl" "--with-imap-ssl"

2
pkgs/top-level/all-packages.nix
View File

@ -7859,12 +7859,14 @@ in
php71-unit = php71.override { php71-unit = php71.override {
config.php.embed = true; config.php.embed = true;
config.php.apxs2 = false; config.php.apxs2 = false;
config.php.systemd = false;
config.php.fpm = false; config.php.fpm = false;
}; };
php72-unit = php72.override { php72-unit = php72.override {
config.php.embed = true; config.php.embed = true;
config.php.apxs2 = false; config.php.apxs2 = false;
config.php.systemd = false;
config.php.fpm = false; config.php.fpm = false;
}; };