From 698d69b2f55dbe91f0236ae5e497c39ed956d434 Mon Sep 17 00:00:00 2001
From: "Jason R. McNeil" <jason@mcneil.dev>
Date: Thu, 19 Aug 2021 00:32:29 -0700
Subject: [PATCH] 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)
---
pkgs/servers/sql/mysql/8.0.x.nix | 4 ++--
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 8e7c5a0425d..e37789e7ee6 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 f29a0f327e3..0022721013b 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;