Merge pull request #215004 from LeSuisse/php-extensions-allow-local-network-darwin

phpExtensions.opcache: fix test environment for darwin
This commit is contained in:
Nick Cao 2023-02-08 09:17:30 +08:00 committed by GitHub
commit a1f39348ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -84,6 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; {
, zendExtension ? false , zendExtension ? false
, doCheck ? true , doCheck ? true
, extName ? name , extName ? name
, allowLocalNetworking ? false
, ... , ...
}@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // {
pname = "php-${name}"; pname = "php-${name}";
@ -103,6 +104,7 @@ lib.makeScope pkgs.newScope (self: with self; {
]; ];
inherit configureFlags internalDeps buildInputs zendExtension doCheck; inherit configureFlags internalDeps buildInputs zendExtension doCheck;
__darwinAllowLocalNetworking = allowLocalNetworking;
preConfigurePhases = [ preConfigurePhases = [
"cdToExtensionRootPhase" "cdToExtensionRootPhase"
@ -412,7 +414,7 @@ lib.makeScope pkgs.newScope (self: with self; {
]; ];
zendExtension = true; zendExtension = true;
# Tests launch the builtin webserver. # Tests launch the builtin webserver.
__darwinAllowLocalNetworking = true; allowLocalNetworking = true;
} }
{ {
name = "openssl"; name = "openssl";