Skip to content

Commit c384560

Browse files
authored
cargo-cache: fix compilation on darwin (#368717)
2 parents 1b4a15a + 68526a6 commit c384560

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pkgs/development/tools/rust/cargo-cache/default.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
stdenv,
44
fetchFromGitHub,
55
rustPlatform,
6-
libiconv,
7-
Security,
6+
zlib,
87
}:
98

109
rustPlatform.buildRustPackage rec {
@@ -21,8 +20,7 @@ rustPlatform.buildRustPackage rec {
2120
cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
2221

2322
buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
24-
libiconv
25-
Security
23+
zlib
2624
];
2725

2826
checkFlags = [ "offline_tests" ];

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6822,9 +6822,7 @@ with pkgs;
68226822
cargo-bazel = callPackage ../development/tools/rust/cargo-bazel {
68236823
inherit (darwin.apple_sdk.frameworks) Security;
68246824
};
6825-
cargo-cache = callPackage ../development/tools/rust/cargo-cache {
6826-
inherit (darwin.apple_sdk.frameworks) Security;
6827-
};
6825+
cargo-cache = callPackage ../development/tools/rust/cargo-cache { };
68286826
cargo-crev = callPackage ../development/tools/rust/cargo-crev {
68296827
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration CoreFoundation;
68306828
};

0 commit comments

Comments
 (0)