public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

phpPackages.dom: make patch conditional

Browse Source 
corresponds to 4c424870e62a5095896b48a12e9903835f6a5e53, but we still
need the patch for php73
This commit is contained in:
ajs124 2021-07-01 21:21:16 +02:00
parent beb567f715
commit 0319a28db8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/php-packages.nix
View File

@ -270,7 +270,7 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "dba"; } { name = "dba"; }
{ name = "dom"; { name = "dom";
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
patches = [ patches = lib.optionals (lib.versionOlder php.version "7.4") [
# https://github.com/php/php-src/pull/7030 # https://github.com/php/php-src/pull/7030
(fetchpatch { (fetchpatch {
url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; 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. # For some reason `patch` fails to remove these files correctly.
# Since `postPatch` is already used in `mkExtension`, we have to make it here. # 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/bug43364.phpt
rm tests/bug80268.phpt rm tests/bug80268.phpt
''; '';