From 4d4fe31a8b34b002088d9620d60c3974c406dd1d Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 4 Dec 2024 00:45:27 -0500 Subject: [PATCH] Drop macOS SDKs that follow "the old way" Nixpkgs now has much more reasonable handling of macOS SDKs, and this old default is not generally needed for builds anymore. I think having these SDKs in the inputs is a bit of a nuisance now, since it means there are mixed framework versions in the closure. See: https://discourse.nixos.org/t/on-the-future-of-darwin-sdks-or-how-you-can-stop-worrying-and-put-the-sdk-in-build-inputs/50574 See: NixOS/nixpkgs#346043 --- build.nix | 8 +------- default.nix | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/build.nix b/build.nix index f05cd2c..f73a495 100644 --- a/build.nix +++ b/build.nix @@ -58,7 +58,6 @@ , lib , rsync , jq -, darwin , writeText , runCommandLocal , remarshal @@ -137,12 +136,7 @@ let ++ lib.optionals (mode == "clippy") [clippy] ++ neededCrateSpecificOverrides.nativeBuildInputs; - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.Security - darwin.apple_sdk.frameworks.CoreServices - darwin.cf-private - darwin.libiconv - ] ++ buildInputs + buildInputs = buildInputs ++ neededCrateSpecificOverrides.buildInputs; inherit builtDependencies; diff --git a/default.nix b/default.nix index 1bc1383..9a1ff20 100644 --- a/default.nix +++ b/default.nix @@ -1,5 +1,4 @@ { cargo -, darwin , fetchurl , jq , lib