From b3d419c3e9cc55a0b6421e634ea8b43576841c19 Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Fri, 26 Jul 2024 08:15:05 +0000 Subject: [PATCH] kcl,kclvm,kclvm_cli: remove darwin.cctools darwin.cctools is now just cctools so referencing it in staging and staging-next creates eval errors. However, given that cctools is already part of the darwin stdenv it is not necessary to include the package directly. --- pkgs/by-name/kc/kcl/package.nix | 4 +--- pkgs/by-name/kc/kclvm/package.nix | 1 - pkgs/by-name/kc/kclvm_cli/package.nix | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 7a18f5d9e91a..af6933a9cd47 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -30,9 +30,7 @@ buildGoModule rec { "-X=kcl-lang.io/cli/pkg/version.version=v${version}" ]; - nativeBuildInputs = [ makeWrapper installShellFiles ] ++ ( - lib.optionals stdenv.isDarwin [ darwin.cctools ] - ); + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ kclvm kclvm_cli ] ++ ( lib.optional stdenv.isDarwin [ diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix index db1a2c232d92..249c9bca9812 100644 --- a/pkgs/by-name/kc/kclvm/package.nix +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ rustc ] ++ lib.optionals stdenv.isDarwin [ - darwin.cctools darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix index e91a8bd450af..15e86da2f872 100644 --- a/pkgs/by-name/kc/kclvm_cli/package.nix +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec { buildInputs = [ kclvm rustc ] ++ ( lib.optionals stdenv.isDarwin [ - darwin.cctools darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.CoreServices darwin.apple_sdk.frameworks.SystemConfiguration