Merge pull request #115487 from stephank/fix-darwin-php
php80: fix on darwin
This commit is contained in:
commit
96390f4286
|
@ -401,7 +401,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
# oci8 (7.4, 7.3, 7.2)
|
# oci8 (7.4, 7.3, 7.2)
|
||||||
# odbc (7.4, 7.3, 7.2)
|
# odbc (7.4, 7.3, 7.2)
|
||||||
{ name = "opcache";
|
{ 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
|
valgrind.dev
|
||||||
];
|
];
|
||||||
patches = lib.optionals (lib.versionOlder php.version "7.4") [
|
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"
|
#include "zend_accelerator_util_funcs.h"
|
||||||
'') ];
|
'') ];
|
||||||
zendExtension = true;
|
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";
|
{ name = "openssl";
|
||||||
buildInputs = [ openssl ];
|
buildInputs = [ openssl ];
|
||||||
configureFlags = [ "--with-openssl" ];
|
configureFlags = [ "--with-openssl" ];
|
||||||
|
|
Loading…
Reference in a new issue