diff --git a/pkgs/php/7.3.nix b/pkgs/php/7.3.nix index 72cd4306..3c610c2f 100644 --- a/pkgs/php/7.3.nix +++ b/pkgs/php/7.3.nix @@ -13,7 +13,16 @@ let url = "https://github.com/NixOS/nixpkgs/raw/42e9a2ccfab2a96d28c3c164a6cf41fb6f769de5/pkgs/development/interpreters/php/php73-darwin-isfinite.patch"; sha256 = "V0mLLmXa2qJyxIVW/7nEml6cXZTBbr42kkJiij9KPyk="; }) - ]; + # Handle macos versions that don't start with 10.* in libtool. + # https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d + (prev.pkgs.fetchpatch2 { + url = "https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d.patch"; + sha256 = "sha256-x0vEcoXNFeQi3re1TrK/Np9AH5dy3wf95xM08xCyGE0="; + includes = [ + "build/libtool.m4" + ]; + }) + ]; }; in base.withExtensions ( diff --git a/pkgs/phps.nix b/pkgs/phps.nix index 71a884da..63489cc0 100644 --- a/pkgs/phps.nix +++ b/pkgs/phps.nix @@ -43,6 +43,9 @@ let "--enable-libxml" "--with-libxml-dir=${prev.libxml2.dev}" + ] + ++ prev.lib.optionals (prev.lib.versionAtLeast args.version "7.3") [ + "--with-pcre-regex=${prev.pcre2.dev}" ]; buildInputs =