philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #112360 from helsinki-systems/fix/php-xls-xmlrpc 

phpExtensions80: fix xls, disable xmlrpc
master
Elis Hirwing 2021-02-10 10:35:21 +01:00 committed by GitHub
parent c27692c75b b8c532e061
commit 173edd9547
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,6 +510,8 @@ lib.makeScope pkgs.newScope (self: with self; {
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "xmlrpc";
buildInputs = [ libxml2 libiconv ];
# xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
enable = lib.versionOlder php.version "8.0";
configureFlags = [ "--with-xmlrpc" ]
# Required to build on darwin.
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
@ -520,7 +522,7 @@ lib.makeScope pkgs.newScope (self: with self; {
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
{ name = "xsl";
buildInputs = [ libxslt libxml2 ];
doCheck = !(lib.versionOlder php.version "7.4");
doCheck = lib.versionOlder php.version "8.0";
configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }
{ name = "zend_test"; }
{ name = "zip";