public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #122553 from stephank/fix-cargo-msrv-darwin

Browse Source 
cargo-msrv: fix darwin build
This commit is contained in:
Jörg Thalheim 2021-05-11 09:46:27 +01:00 committed by GitHub
commit 9d8d0b89c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
, 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 ];

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

@ -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;