diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 3f45bf634d80..87784a47966a 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,8 +4,8 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.12"; - hash = "sha256-Lr1TgusJDWAwh9pkntId5ksHlha8mgKrvFMribF+NGg="; + version = "8.4.13"; + hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ="; } ); in diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f9180f44b37a..577a6e97308e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,5 +1,6 @@ { stdenv, + fetchpatch, config, callPackages, lib, @@ -445,6 +446,14 @@ lib.makeScope pkgs.newScope ( configureFlags = [ "--enable-dom" ]; + patches = lib.optionals (lib.versionAtLeast php.version "8.4") [ + # Fix build of ext-dom. + # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14) + (fetchpatch { + url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch"; + hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA="; + }) + ]; } { name = "enchant";