diff options
| author | Robert Scott <code@humanleg.org.uk> | 2021-08-21 23:22:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-21 23:22:06 +0100 |
| commit | 0be4a281835db6b1954c0f727cf3c4321822bc2b (patch) | |
| tree | 6279f368cdd3e0ce06db101504add0c3a3c0dc7e | |
| parent | Merge pull request #135092 from NixOS/backport-134764-to-release-21.05 (diff) | |
| parent | mysql80: fix build on darwin (diff) | |
| download | nixpkgs-0be4a281835db6b1954c0f727cf3c4321822bc2b.tar.gz | |
Merge pull request #135001 from jasonrm/backport/134767-to-21.05
[21.05] mysql80: fix build on darwin
| -rw-r--r-- | pkgs/servers/sql/mysql/8.0.x.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 8e7c5a0425d3..e37789e7ee6c 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -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" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae55f4c8a71d..f0e1b3cacc2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |