diff options
| author | Izorkin <izorkin@elven.pw> | 2019-06-06 23:06:10 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-06-11 22:21:36 +0300 |
| commit | a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0 (patch) | |
| tree | 9daadf55f722b384671e192caf3af360e7c7d05f /pkgs/development/interpreters/php | |
| parent | 925f803e28b3b45692587bfedcf38491ad525534 (diff) | |
| download | nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar.gz nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar.bz2 nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar.lz nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar.xz nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.tar.zst nixlib-a6a26c1bc57a065cf66c8c9b8735f198c4c4f1c0.zip | |
php: update build config
Diffstat (limited to 'pkgs/development/interpreters/php')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 718a7963b2e4..a4a0b41210a4 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,10 +1,10 @@ # pcre functionality is tested in nixos/tests/php-pcre.nix -{ lib, stdenv, fetchurl, flex, bison, autoconf +{ lib, stdenv, fetchurl, autoconf, bison, libtool, pkgconfig, re2c , mysql, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pcre2, pkgconfig, sqlite, config, libjpeg, libpng, freetype +, openssl, pcre, pcre2, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, unixODBC , uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, libzip, re2c, valgrind +, libzip, valgrind }: with lib; @@ -61,7 +61,6 @@ let , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) , 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") }: let @@ -75,8 +74,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf re2c ]; - buildInputs = [ flex bison ] + nativeBuildInputs = [ autoconf bison libtool pkgconfig re2c ]; + buildInputs = [ ] ++ optional (versionOlder version "7.3") pcre ++ optional (versionAtLeast version "7.3") pcre2 ++ optional withSystemd systemd @@ -190,8 +189,7 @@ let ++ optional (!pharSupport) "--disable-phar" ++ optional xmlrpcSupport "--with-xmlrpc" ++ optional cgotoSupport "--enable-re2c-cgoto" - ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ optional valgrindPcreSupport "--with-pcre-valgrind"; + ++ optional valgrindSupport "--with-valgrind=${valgrind.dev}"; hardeningDisable = [ "bindnow" ]; |