From 68526a61402e31d4764fbe3a3f38c09bb3fc2ef8 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Sat, 28 Dec 2024 12:31:36 +0800 Subject: [PATCH] cargo-cache: fix compilation on darwin --- pkgs/development/tools/rust/cargo-cache/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix index 7b8b60ad4125f..2021101430d85 100644 --- a/pkgs/development/tools/rust/cargo-cache/default.nix +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -3,8 +3,7 @@ stdenv, fetchFromGitHub, rustPlatform, - libiconv, - Security, + zlib, }: rustPlatform.buildRustPackage rec { @@ -21,8 +20,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - Security + zlib ]; checkFlags = [ "offline_tests" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 040035177ea0a..be8f29cb7d806 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6822,9 +6822,7 @@ with pkgs; cargo-bazel = callPackage ../development/tools/rust/cargo-bazel { inherit (darwin.apple_sdk.frameworks) Security; }; - cargo-cache = callPackage ../development/tools/rust/cargo-cache { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cargo-cache = callPackage ../development/tools/rust/cargo-cache { }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation; };