diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-03-14 17:58:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 17:58:44 +0000 |
| commit | 96390f4286878291be9c267c5ade5c8917cabaad (patch) | |
| tree | 08b352493c7833fb08b1610bf59294100b880e10 /pkgs/top-level/php-packages.nix | |
| parent | 7163929ceece23d17f5198e35c0c2c6cff1bc625 (diff) | |
| parent | da049ba377f8477a030231ff3f6809b549761989 (diff) | |
| download | nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar.gz nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar.bz2 nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar.lz nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar.xz nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.tar.zst nixpkgs-96390f4286878291be9c267c5ade5c8917cabaad.zip | |
Merge pull request #115487 from stephank/fix-darwin-php
php80: fix on darwin
Diffstat (limited to 'pkgs/top-level/php-packages.nix')
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d548be9ac2d..7db0eb4d6a4 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -401,7 +401,7 @@ lib.makeScope pkgs.newScope (self: with self; { # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) { name = "opcache"; - buildInputs = [ pcre' ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [ + buildInputs = [ pcre' ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [ valgrind.dev ]; patches = lib.optionals (lib.versionOlder php.version "7.4") [ @@ -421,7 +421,9 @@ lib.makeScope pkgs.newScope (self: with self; { #include "zend_accelerator_util_funcs.h" '') ]; zendExtension = true; - doCheck = !(lib.versionOlder php.version "7.4"); } + doCheck = !(lib.versionOlder php.version "7.4"); + # Tests launch the builtin webserver. + __darwinAllowLocalNetworking = true; } { name = "openssl"; buildInputs = [ openssl ]; configureFlags = [ "--with-openssl" ]; |