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

Merge pull request #135001 from jasonrm/backport/134767-to-21.05

Browse Source 
[21.05] mysql80: fix build on darwin
This commit is contained in:
Robert Scott 2021-08-21 23:22:06 +01:00 committed by GitHub
commit 0be4a28183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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
@ -32,7 +32,7 @@ self = stdenv.mkDerivation rec {
] ++ lib.optionals stdenv.isLinux [
numactl libtirpc
] ++ lib.optionals stdenv.isDarwin [
cctools CoreServices developer_cmds
cctools CoreServices developer_cmds DarwinTools
];
outputs = [ "out" "static" ];

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

@ -19476,7 +19476,7 @@ in
};
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;
boost = boost173; # Configure checks for specific version.
protobuf = protobuf3_7;