diff options
| author | Elis Hirwing <elis@hirwing.se> | 2021-02-10 10:35:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 10:35:21 +0100 |
| commit | 173edd9547c65c31e1a5c8c26fe4d5799e01ef47 (patch) | |
| tree | 57588e7dcd885780e74358dd59078ee97802b5bd /pkgs/top-level/php-packages.nix | |
| parent | c27692c75b4e431b9c3e84e4425ac966c62e9efa (diff) | |
| parent | b8c532e0615b492daaacdbc192292af124dc1a96 (diff) | |
| download | nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar.gz nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar.bz2 nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar.lz nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar.xz nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.tar.zst nixpkgs-173edd9547c65c31e1a5c8c26fe4d5799e01ef47.zip | |
Merge pull request #112360 from helsinki-systems/fix/php-xls-xmlrpc
phpExtensions80: fix xls, disable xmlrpc
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index f2d39811a7a..3df697d3d56 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -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"; |