diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-06-25 21:21:28 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-06-25 22:29:23 +0200 |
commit | af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54 (patch) | |
tree | 7f0ea6f9002786261e68bb464f554a108feec905 /pkgs/top-level/php-packages.nix | |
parent | 6b096983f4823704e08930319616bb485f936c93 (diff) | |
download | nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar.gz nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar.bz2 nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar.lz nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar.xz nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.tar.zst nixpkgs-af064a0e12ad8e5a8a2e8d8ad25fc0baf3f8ef54.zip |
php7{2,3}: fix darwin build
* Backported patches from `php-7.4` which fixes the env for all `gettext` and `zlib` tests. * Setting `--with-libxml-dir` is still needed for versions 7.2 and 7.3.
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
-rw-r--r-- | pkgs/top-level/php-packages.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 044e4f8045c..1e6430df983 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -947,6 +947,12 @@ in enable = lib.versionOlder php.version "7.4"; } { name = "gettext"; buildInputs = [ gettext ]; + patches = lib.optionals (lib.versionOlder php.version "7.4") [ + (fetchpatch { + url = "https://github.com/php/php-src/commit/632b6e7aac207194adc3d0b41615bfb610757f41.patch"; + sha256 = "0xn3ivhc4p070vbk5yx0mzj2n7p04drz3f98i77amr51w0vzv046"; + }) + ]; postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; configureFlags = "--with-gettext=${gettext}"; } { name = "gmp"; @@ -1163,6 +1169,10 @@ in doCheck = false; } { name = "zlib"; buildInputs = [ zlib ]; + patches = lib.optionals (lib.versionOlder php.version "7.4") [ + # Derived from https://github.com/php/php-src/commit/f16b012116d6c015632741a3caada5b30ef8a699 + ../development/interpreters/php/zlib-darwin-tests.patch + ]; configureFlags = [ "--with-zlib" ] ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; } ]; |