alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

cargo-msrv: fix darwin build

Browse source
This commit is contained in:
Stéphan Kochen 2021-05-11 10:33:52 +02:00
parent d660a7d361
commit 67e530be79
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/tools/rust/cargo-msrv/default.nix
View file

@ -4,6 +4,9 @@
, nix-update-script , nix-update-script
, pkg-config , pkg-config
, openssl , openssl
, stdenv
, libiconv
, Security
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -28,7 +31,9 @@ rustPlatform.buildRustPackage rec {
# Integration tests fail # Integration tests fail
doCheck = false; doCheck = false;
buildInputs = [ openssl ]; buildInputs = if stdenv.isDarwin
then [ libiconv Security ]
else [ openssl ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

4
pkgs/top-level/all-packages.nix
View file

@ -11529,7 +11529,9 @@ in
cargo-make = callPackage ../development/tools/rust/cargo-make { cargo-make = callPackage ../development/tools/rust/cargo-make {
inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; 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-play = callPackage ../development/tools/rust/cargo-play { };
cargo-raze = callPackage ../development/tools/rust/cargo-raze { cargo-raze = callPackage ../development/tools/rust/cargo-raze {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;