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

Merge pull request #95581 from zowoq/cargo-update

Browse Source 
cargo-update: fix darwin build
This commit is contained in:
Vladyslav M 2020-08-16 18:47:32 +03:00 committed by GitHub
commit 36b2372314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/package-management/cargo-update/default.nix
View File

@ -7,7 +7,9 @@
, libssh2
, openssl
, pkg-config
, zlib }:
, Security
, zlib
}:
rustPlatform.buildRustPackage rec {
pname = "cargo-update";
@ -25,7 +27,7 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libgit2 libssh2 openssl zlib ]
++ stdenv.lib.optional stdenv.isDarwin curl;
++ stdenv.lib.optionals stdenv.isDarwin [ curl Security ];
meta = with stdenv.lib; {
description = "A cargo subcommand for checking and applying updates to installed executables";

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

@ -9434,7 +9434,9 @@ in
};
cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
cargo-tree = callPackage ../tools/package-management/cargo-tree { };
cargo-update = callPackage ../tools/package-management/cargo-update { };
cargo-update = callPackage ../tools/package-management/cargo-update {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-asm = callPackage ../development/tools/rust/cargo-asm {
inherit (darwin.apple_sdk.frameworks) Security;