diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-07-02 17:14:53 +0200 |
| commit | c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d (patch) | |
| tree | d1a10ef8a3e8fe00ac12ac1437ec46a856521084 /pkgs/development/interpreters/php/default.nix | |
| parent | 798c2d8bc1e947eb26e249b326bfaba49a91b735 (diff) | |
| parent | 3ee58112693c11cd8157495e09714cf9ddb599b3 (diff) | |
| download | nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.gz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.bz2 nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.lz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.xz nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.tar.zst nixpkgs-c33ca7c5ce4d80246fd656dd8a5ab078cc90c03d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters/php/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 78a3e91179f..b930e54fa4c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -8,7 +8,7 @@ let { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 - , systemd, valgrind + , systemd, valgrind, xcbuild , version , sha256 @@ -143,7 +143,8 @@ let enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; buildInputs = # PCRE extension @@ -177,7 +178,10 @@ let ++ lib.optional (!cliSupport) "--disable-cli" ++ lib.optional fpmSupport "--enable-fpm" ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] ++ lib.optional pharSupport "--enable-phar" ++ lib.optional phpdbgSupport "--enable-phpdbg" |