Skip to content

Commit

Permalink
Drop macOS SDKs that follow "the old way"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
grahamc authored and nmattia committed Dec 4, 2024
1 parent 3fb418e commit 378614f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions build.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
, lib
, rsync
, jq
, darwin
, writeText
, runCommandLocal
, remarshal
Expand Down Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{ cargo
, darwin
, fetchurl
, jq
, lib
Expand Down

0 comments on commit 378614f

Please sign in to comment.