diff --git a/pkgs/development/tools/mysql-shell/8.nix b/pkgs/development/tools/mysql-shell/8.nix index dde88159f08b0..79f8f638c08c5 100644 --- a/pkgs/development/tools/mysql-shell/8.nix +++ b/pkgs/development/tools/mysql-shell/8.nix @@ -5,9 +5,8 @@ , fetchurl , git , cctools -, DarwinTools +, darwin , makeWrapper -, CoreServices , bison , openssl , protobuf @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; buildInputs = [ curl @@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { antlr.runtime.cpp ] ++ pythonDeps ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/development/tools/mysql-shell/innovation.nix b/pkgs/development/tools/mysql-shell/innovation.nix index 411c867334d0a..5732459550067 100644 --- a/pkgs/development/tools/mysql-shell/innovation.nix +++ b/pkgs/development/tools/mysql-shell/innovation.nix @@ -5,9 +5,8 @@ , fetchurl , git , cctools -, DarwinTools +, darwin , makeWrapper -, CoreServices , bison , openssl , protobuf @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools DarwinTools ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.DarwinTools ]; buildInputs = [ curl @@ -96,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { antlr.runtime.cpp ] ++ pythonDeps ++ lib.optionals stdenv.hostPlatform.isLinux [ libtirpc ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.libutil ]; preConfigure = '' # Build MySQL diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3226511390c3..9e19da69da50b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -540,8 +540,6 @@ with pkgs; inherit ({ mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; icu = icu73; protobuf = protobuf_24; @@ -551,8 +549,6 @@ with pkgs; ; mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix { - inherit (darwin) DarwinTools; - inherit (darwin.apple_sdk.frameworks) CoreServices; antlr = antlr4_10; icu = icu73; protobuf = protobuf_24;