From c7891595c92f9f687f29d7187b5c87b4042df226 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 11 Nov 2017 17:02:07 +0100
Subject: php: Fix php pcre by using external lib

---
 pkgs/development/interpreters/php/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/interpreters/php')

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b28d5acf9786..3f97116dea2e 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
 , mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, openssl, pcre, pkgconfig, sqlite, config, libjpeg, libpng, freetype
 , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
 , uwimap, pam, gmp, apacheHttpd, libiconv, systemd }:
 
@@ -91,6 +91,11 @@ let
           configureFlags = [ "--enable-pcntl" ];
         };
 
+        pcre = {
+          configureFlags = ["--with-pcre-regex=${pcre.dev} PCRE_LIBDIR=${pcre}"];
+          buildInputs = [ pcre ];
+        };
+
         readline = {
           configureFlags = ["--with-readline=${readline.dev}"];
           buildInputs = [ readline ];
@@ -240,6 +245,7 @@ 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;
-- 
cgit 1.4.1