Merge pull request #112360 from helsinki-systems/fix/php-xls-xmlrpc
phpExtensions80: fix xls, disable xmlrpc
This commit is contained in:
commit
173edd9547
|
@ -510,6 +510,8 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
|
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
|
||||||
{ name = "xmlrpc";
|
{ name = "xmlrpc";
|
||||||
buildInputs = [ libxml2 libiconv ];
|
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" ]
|
configureFlags = [ "--with-xmlrpc" ]
|
||||||
# Required to build on darwin.
|
# Required to build on darwin.
|
||||||
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
|
++ 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}" ]; }
|
++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
|
||||||
{ name = "xsl";
|
{ name = "xsl";
|
||||||
buildInputs = [ libxslt libxml2 ];
|
buildInputs = [ libxslt libxml2 ];
|
||||||
doCheck = !(lib.versionOlder php.version "7.4");
|
doCheck = lib.versionOlder php.version "8.0";
|
||||||
configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }
|
configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }
|
||||||
{ name = "zend_test"; }
|
{ name = "zend_test"; }
|
||||||
{ name = "zip";
|
{ name = "zip";
|
||||||
|
|
Loading…
Reference in a new issue