Merge pull request #31526 from srhb/fix-php-external-pcre

php: Fix php pcre by using external lib
This commit is contained in:
Orivej Desh
2017-11-13 20:15:37 +00:00
committed by GitHub
5 changed files with 52 additions and 2 deletions

View File

@@ -1,6 +1,8 @@
# pcre functionality is tested in nixos/tests/php-pcre.nix
{ 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 }:
@@ -23,7 +25,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";
@@ -287,6 +289,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";