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

phpExtensions.dom: fix build

Browse Source 
ZHF #122042
This commit is contained in:
Maximilian Bosch 2021-05-23 20:59:33 +02:00
parent 77efb5b850
commit 53951c0c14
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,7 +235,7 @@ lib.makeScope pkgs.newScope (self: with self; {
(dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}")
internalDeps} internalDeps}
''; '';
checkPhase = "echo n | make test"; checkPhase = "runHook preCheck; echo n | make test; runHook postCheck";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib/php/extensions mkdir -p $out/lib/php/extensions
@ -270,6 +270,20 @@ lib.makeScope pkgs.newScope (self: with self; {
{ name = "dba"; } { name = "dba"; }
{ name = "dom"; { name = "dom";
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
patches = [
# https://github.com/php/php-src/pull/7030
(fetchpatch {
url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch";
sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k";
excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ];
})
];
# For some reason `patch` fails to remove these files correctly.
# Since `postPatch` is already used in `mkExtension`, we have to make it here.
preCheck = ''
rm tests/bug43364.phpt
rm tests/bug80268.phpt
'';
configureFlags = [ "--enable-dom" ] configureFlags = [ "--enable-dom" ]
# Required to build on darwin. # Required to build on darwin.
++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }