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

Merge pull request #100289 from happysalada/cargo-edit

Browse Source 
cargo-edit: fix Darwin build
This commit is contained in:
Daniël de Kok 2020-10-13 09:12:34 +02:00 committed by GitHub
commit 7ab39519e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/tools/package-management/cargo-edit/default.nix
View File

@ -1,6 +1,14 @@
{ stdenv, lib, darwin { stdenv
, rustPlatform, fetchFromGitHub , lib
, openssl, pkg-config, libiconv }: , rustPlatform
, fetchFromGitHub
, pkg-config
, xcbuild
, openssl
, libiconv
, Security
, zlib
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-edit"; pname = "cargo-edit";
@ -15,8 +23,18 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1h1sy54p7zxijydnhzvkxli90d72biv1inni17licb0vb9dihmnf"; cargoSha256 = "1h1sy54p7zxijydnhzvkxli90d72biv1inni17licb0vb9dihmnf";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; # The cc crate runs xcbuild. This dependency can be removed once
# the following PR is merged from staging into master:
#
# https://github.com/NixOS/nixpkgs/pull/97000
xcbuild
];
buildInputs = [ openssl zlib ] ++ lib.optionals stdenv.isDarwin [
libiconv
Security
];
doCheck = false; # integration tests depend on changing cargo config doCheck = false; # integration tests depend on changing cargo config

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

@ -9702,7 +9702,9 @@ in
}; };
cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-deps = callPackage ../tools/package-management/cargo-deps { };
cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-download = callPackage ../tools/package-management/cargo-download { };
cargo-edit = callPackage ../tools/package-management/cargo-edit { }; cargo-edit = callPackage ../tools/package-management/cargo-edit {
inherit (darwin.apple_sdk.frameworks) Security;
};
cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-kcov = callPackage ../tools/package-management/cargo-kcov { };
cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { };
cargo-license = callPackage ../tools/package-management/cargo-license { }; cargo-license = callPackage ../tools/package-management/cargo-license { };