diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-06-09 20:49:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 20:49:38 +0200 |
| commit | 902a487da5196399b8149ad972ee6d6297b02c69 (patch) | |
| tree | 2e451dff8e845d67030648a9951223a1b53cb892 | |
| parent | 593754412bff02f735ba339d7a3afda41ad19bb5 (diff) | |
| parent | b09b1844d3f85758719619352556d5c3bbca5e0b (diff) | |
Merge pull request #318536 from drupol/php81/fix-builds-with-libxml2
php81: restore patch for libxml2 on darwin
| -rw-r--r-- | pkgs/development/interpreters/php/8.1.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index a6eed4d4772bf..4b53f9e6c84b3 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -1,9 +1,17 @@ -{ callPackage, ... }@_args: +{ callPackage, fetchpatch, ... }@_args: let - base = callPackage ./generic.nix (_args // { + base = callPackage ./generic.nix ((removeAttrs _args [ "fetchpatch" ]) // { version = "8.1.29"; hash = "sha256-h6YDEyY/L1M/GA5xknLKXkfNmITU7DyTcgGY6v+uCCc="; + extraPatches = [ + # Fix build with libxml 2.12+. + # Patch from https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082 + (fetchpatch { + url = "https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch"; + hash = "sha256-HvpTL7aXO9gr4glFdhqUWQPrG8TYTlvbNINq33M3zS0="; + }) + ]; }); in base.withExtensions ({ all, ... }: with all; ([ |