Merge pull request #318536 from drupol/php81/fix-builds-with-libxml2

php81: restore patch for libxml2 on darwin
This commit is contained in:
Pol Dellaiera 2024-06-09 20:49:38 +02:00 committed by GitHub
commit 902a487da5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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; ([