From ef82ab6575509e998da55bd0cacd6dc495999e1a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 11 Oct 2024 17:52:53 -0400 Subject: [PATCH] rcodesign: update to use the new SDK pattern on Darwin --- pkgs/development/tools/rcodesign/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rcodesign/default.nix b/pkgs/development/tools/rcodesign/default.nix index 73434ba95ef0..b96258cf1672 100644 --- a/pkgs/development/tools/rcodesign/default.nix +++ b/pkgs/development/tools/rcodesign/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, darwin +, apple-sdk_11 , uutils-coreutils }: @@ -17,9 +17,6 @@ rustPlatform.buildRustPackage rec { hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Security - ]; cargoPatches = [ # Update time to a version that is compatible with Rust 1.80 ./update-time-rs-in-cargo-lock.patch @@ -34,6 +31,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI="; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]; cargoBuildFlags = [ # Only build the binary we want diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c36684541f48..f9432c73a229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18207,7 +18207,7 @@ with pkgs; hammer = callPackage ../development/tools/parsing/hammer { }; - rcodesign = darwin.apple_sdk_11_0.callPackage ../development/tools/rcodesign {}; + rcodesign = callPackage ../development/tools/rcodesign { }; rdocker = callPackage ../development/tools/rdocker { };