diff options
author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2017-11-12 13:19:17 +0100 |
---|---|---|
committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2017-11-12 13:19:17 +0100 |
commit | 7e17685d094aa8b6bff5324c4568986286dcff02 (patch) | |
tree | 109cbc8b60138ad4310a7049fbe63e838350fc6e /pkgs/development/interpreters/php | |
parent | 201444f02dbf3f85ba79d0a1e03c16bbf66517e9 (diff) | |
download | nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar.gz nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar.bz2 nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar.lz nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar.xz nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.tar.zst nixlib-7e17685d094aa8b6bff5324c4568986286dcff02.zip |
php: Disallow bundled pcre
Diffstat (limited to 'pkgs/development/interpreters/php')
-rw-r--r-- | pkgs/development/interpreters/php/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index faf88ca13a98..e46c6b4a0325 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -23,7 +23,7 @@ let enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ flex bison ] + buildInputs = [ flex bison pcre ] ++ lib.optional stdenv.isLinux systemd; CXXFLAGS = lib.optional stdenv.cc.isClang "-std=c++11"; @@ -93,11 +93,6 @@ let configureFlags = [ "--enable-pcntl" ]; }; - pcre = { - configureFlags = ["--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"]; - buildInputs = [ pcre ]; - }; - readline = { configureFlags = ["--with-readline=${readline.dev}"]; buildInputs = [ readline ]; @@ -247,7 +242,6 @@ let curlWrappersSupport = (!php7) && (config.php.curlWrappers or true); gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; - pcreSupport = config.php.pcreExternal or true; postgresqlSupport = config.php.postgresql or true; pdo_pgsqlSupport = config.php.pdo_pgsql or true; readlineSupport = config.php.readline or true; @@ -293,6 +287,7 @@ let configureFlags = [ "--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.isLinux "--with-fpm-systemd"; |