alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #134767 from jasonrm/fix/mysql-on-darwin

Browse source
This commit is contained in:
Sandro 2021-08-20 12:21:32 +02:00 committed by GitHub
parent a0e4acf119 5c452f15af
commit f4ffa26744
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

@ -20216,7 +20216,7 @@ with pkgs;
};
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_11;