diff options
| author | Jason R. McNeil <jason@mcneil.dev> | 2021-08-19 00:32:29 -0700 |
|---|---|---|
| committer | Jason R. McNeil <jason@mcneil.dev> | 2021-08-20 13:59:15 -0700 |
| commit | 698d69b2f55dbe91f0236ae5e497c39ed956d434 (patch) | |
| tree | e7abb676f6b48728c7ea655908f2a5085fb7c9dd | |
| parent | Merge pull request #134947 from NixOS/backport-134692-to-release-21.05 (diff) | |
| download | nixpkgs-698d69b2f55dbe91f0236ae5e497c39ed956d434.tar.gz | |
mysql80: fix build on darwin
sw_vers is called during build since 8.0.26
- https://github.com/mysql/mysql-server/commit/83b87ae7f8b0849cca20778ab0e34f2026619c1e
Fixes #132288
(cherry picked from commit 5c452f15af7d11a1609f25ac14b42b82d0185a37)
| -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 f29a0f327e3a..0022721013b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19474,7 +19474,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; |