From 0319a28db83c2bd0d4bf4a3e77a611c0dd5e9e62 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 1 Jul 2021 21:21:16 +0200 Subject: [PATCH] phpPackages.dom: make patch conditional corresponds to 4c424870e62a5095896b48a12e9903835f6a5e53, but we still need the patch for php73 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c59391ce290..0ecd4e9b56b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -270,7 +270,7 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "dba"; } { name = "dom"; buildInputs = [ libxml2 ]; - patches = [ + patches = lib.optionals (lib.versionOlder php.version "7.4") [ # https://github.com/php/php-src/pull/7030 (fetchpatch { url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; @@ -280,7 +280,7 @@ lib.makeScope pkgs.newScope (self: with self; { ]; # For some reason `patch` fails to remove these files correctly. # Since `postPatch` is already used in `mkExtension`, we have to make it here. - preCheck = '' + preCheck = lib.optionals (lib.versionOlder php.version "7.4") '' rm tests/bug43364.phpt rm tests/bug80268.phpt '';