diff options
| author | Izorkin <izorkin@elven.pw> | 2019-06-06 22:16:58 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-06-11 22:21:35 +0300 |
| commit | 925f803e28b3b45692587bfedcf38491ad525534 (patch) | |
| tree | 182af7c089952f6271e7c429545a08f2eea58f39 /pkgs/development/interpreters/php | |
| parent | f93d637ef9368347d70857f1a1efef3f4439ee7e (diff) | |
| download | nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar.gz nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar.bz2 nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar.lz nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar.xz nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.tar.zst nixpkgs-925f803e28b3b45692587bfedcf38491ad525534.zip | |
phpPackages: build phpPackages with re2c
Diffstat (limited to 'pkgs/development/interpreters/php')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index ee980e1cdbc..718a7963b2e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -59,8 +59,7 @@ let , cliSupport ? config.php.cli or true , pharSupport ? config.php.phar or true , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) - , re2cSupport ? config.php.re2c or true - , cgotoSupport ? (config.php.cgoto or false) && (re2cSupport) + , cgotoSupport ? config.php.cgoto or false , valgrindSupport ? (config.php.valgrind or true) && (versionAtLeast version "7.2") , valgrindPcreSupport ? (config.php.valgrindPcreSupport or false) && (valgrindSupport) && (versionAtLeast version "7.2") }: @@ -76,7 +75,7 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkgconfig autoconf re2c ]; buildInputs = [ flex bison ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 @@ -108,7 +107,6 @@ let ++ optional tidySupport html-tidy ++ optional argon2Support libargon2 ++ optional libzipSupport libzip - ++ optional re2cSupport re2c ++ optional valgrindSupport valgrind; CXXFLAGS = optional stdenv.cc.isClang "-std=c++11"; |