From 182513d558534c79e0666904a1454c4e405b61a3 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 00:10:12 +0800 Subject: [PATCH] cargo-bisect-rustc: fix darwin build --- .../tools/rust/cargo-bisect-rustc/default.nix | 9 +++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix index 39056d826ed7..9babac9ebade 100644 --- a/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix +++ b/pkgs/development/tools/rust/cargo-bisect-rustc/default.nix @@ -2,13 +2,13 @@ stdenv, lib, fetchFromGitHub, + darwin, rustPlatform, pkg-config, openssl, runCommand, patchelf, zlib, - Security, }: rustPlatform.buildRustPackage rec { @@ -43,7 +43,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = + [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; cargoHash = "sha256-CgEs0cejquFRY3VN6CgbE23Gipg+LEuWp/jSIkITrjw="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6aab5726b385..ad091e5eea7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16618,9 +16618,7 @@ with pkgs; }; cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { }; cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; - cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-bisect-rustc = callPackage ../development/tools/rust/cargo-bisect-rustc { }; cargo-bitbake = callPackage ../development/tools/rust/cargo-bitbake { }; cargo-c = callPackage ../development/tools/rust/cargo-c { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;