JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #115487 from stephank/fix-darwin-php

Browse Source 
php80: fix on darwin
This commit is contained in:
Robert Scott 2021-03-14 17:58:44 +00:00 committed by GitHub
commit 96390f4286
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/php-packages.nix
View File

@ -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" ];