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

mysql80: fix build on darwin 

sw_vers is called during build since 8.0.26

- 83b87ae7f8

Fixes #132288

(cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37)
This commit is contained in:
Jason R. McNeil 2021-08-19 00:32:29 -07:00
parent 1dc32d71d5
commit 698d69b2f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/sql/mysql/8.0.x.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, bison, cmake, pkg-config { lib, stdenv, fetchurl, bison, cmake, pkg-config
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd , boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl , numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools
}: }:
let let
@ -32,7 +32,7 @@ self = stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isLinux [ ] ++ lib.optionals stdenv.isLinux [
numactl libtirpc numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
cctools CoreServices developer_cmds cctools CoreServices developer_cmds DarwinTools
]; ];
outputs = [ "out" "static" ]; outputs = [ "out" "static" ];

2
pkgs/top-level/all-packages.nix
View File

@ -19474,7 +19474,7 @@ in
}; };
mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
inherit (darwin) cctools developer_cmds; inherit (darwin) cctools developer_cmds DarwinTools;
inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin.apple_sdk.frameworks) CoreServices;
boost = boost173; # Configure checks for specific version. boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_7; protobuf = protobuf3_7;