Skip to content

Commit 7e53d72

Browse files
committed
php73: fix builds on darwin architecture
1 parent a74d5a1 commit 7e53d72

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

pkgs/php/7.3.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,16 @@ let
1313
url = "https://github.com/NixOS/nixpkgs/raw/42e9a2ccfab2a96d28c3c164a6cf41fb6f769de5/pkgs/development/interpreters/php/php73-darwin-isfinite.patch";
1414
sha256 = "V0mLLmXa2qJyxIVW/7nEml6cXZTBbr42kkJiij9KPyk=";
1515
})
16-
];
16+
# Handle macos versions that don't start with 10.* in libtool.
17+
# https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d
18+
(prev.pkgs.fetchpatch2 {
19+
url = "https://github.com/php/php-src/commit/d016434ad33284dfaceb8d233351d34356566d7d.patch";
20+
sha256 = "sha256-x0vEcoXNFeQi3re1TrK/Np9AH5dy3wf95xM08xCyGE0=";
21+
includes = [
22+
"build/libtool.m4"
23+
];
24+
})
25+
];
1726
};
1827
in
1928
base.withExtensions (

pkgs/phps.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ let
4343

4444
"--enable-libxml"
4545
"--with-libxml-dir=${prev.libxml2.dev}"
46+
]
47+
++ prev.lib.optionals (prev.lib.versionAtLeast args.version "7.3") [
48+
"--with-pcre-regex=${prev.pcre2.dev}"
4649
];
4750

4851
buildInputs =

0 commit comments

Comments
 (0)