Merge pull request #49673 from danieldk/cargo-asm-security

cargo-asm: fix build on macOS Mojave
This commit is contained in:
Vladyslav M 2018-11-03 10:25:25 +02:00 committed by GitHub
commit 6742bdc845
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, Security }:
rustPlatform.buildRustPackage rec {
name = "cargo-asm-${version}";
@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1m2j6i8hc8isdlj77gv9m6sk6q0x3bvzpva2k16g27i1ngy1989b";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
# Test checks against machine code output, which fails with some
# LLVM/compiler versions.
doCheck = false;

View file

@ -7357,7 +7357,9 @@ with pkgs;
cargo-tree = callPackage ../tools/package-management/cargo-tree { };
cargo-update = callPackage ../tools/package-management/cargo-update { };
cargo-asm = callPackage ../development/tools/rust/cargo-asm { };
cargo-asm = callPackage ../development/tools/rust/cargo-asm {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
pyo3-pack = callPackage ../development/tools/rust/pyo3-pack { };