From 67e530be793dd3c9b1c9f6eb61b471ddb99b796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Tue, 11 May 2021 10:33:52 +0200 Subject: [PATCH] cargo-msrv: fix darwin build --- pkgs/development/tools/rust/cargo-msrv/default.nix | 7 ++++++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-msrv/default.nix b/pkgs/development/tools/rust/cargo-msrv/default.nix index 32ce1464f82..d5feba80d09 100644 --- a/pkgs/development/tools/rust/cargo-msrv/default.nix +++ b/pkgs/development/tools/rust/cargo-msrv/default.nix @@ -4,6 +4,9 @@ , nix-update-script , pkg-config , openssl +, stdenv +, libiconv +, Security }: rustPlatform.buildRustPackage rec { @@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec { # Integration tests fail doCheck = false; - buildInputs = [ openssl ]; + buildInputs = if stdenv.isDarwin + then [ libiconv Security ] + else [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2237cc7a9..d7b52b65724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11529,7 +11529,9 @@ in cargo-make = callPackage ../development/tools/rust/cargo-make { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; - cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { }; + cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security;