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

php: Disallow bundled pcre

Browse Source
This commit is contained in:
Sarah Brofeldt 2017-11-12 13:19:17 +01:00
parent 201444f02d
commit 7e17685d09
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ flex bison ] buildInputs = [ flex bison pcre ]
++ lib.optional stdenv.isLinux systemd; ++ lib.optional stdenv.isLinux systemd;
CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11"; CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11";
@ -93,11 +93,6 @@ let
configureFlags = [ "--enable-pcntl" ]; configureFlags = [ "--enable-pcntl" ];
}; };
pcre = {
configureFlags = ["--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"];
buildInputs = [ pcre ];
};
readline = { readline = {
configureFlags = ["--with-readline=${readline.dev}"]; configureFlags = ["--with-readline=${readline.dev}"];
buildInputs = [ readline ]; buildInputs = [ readline ];
@ -247,7 +242,6 @@ let
curlWrappersSupport = (!php7) && (config.php.curlWrappers or true); curlWrappersSupport = (!php7) && (config.php.curlWrappers or true);
gettextSupport = config.php.gettext or true; gettextSupport = config.php.gettext or true;
pcntlSupport = config.php.pcntl or true; pcntlSupport = config.php.pcntl or true;
pcreSupport = config.php.pcreExternal or true;
postgresqlSupport = config.php.postgresql or true; postgresqlSupport = config.php.postgresql or true;
pdo_pgsqlSupport = config.php.pdo_pgsql or true; pdo_pgsqlSupport = config.php.pdo_pgsql or true;
readlineSupport = config.php.readline or true; readlineSupport = config.php.readline or true;
@ -293,6 +287,7 @@ let
configureFlags = [ configureFlags = [
"--with-config-file-scan-dir=/etc/php.d" "--with-config-file-scan-dir=/etc/php.d"
"--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"
] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"
++ lib.optional stdenv.isLinux "--with-fpm-systemd"; ++ lib.optional stdenv.isLinux "--with-fpm-systemd";