diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:20:00 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-11-09 07:26:53 +0100 |
commit | 457e94d9008a55f0302100b00b77ea9ea478eaef (patch) | |
tree | fa6c4caad3cd47fcff78421a553086cd49dc9f54 /pkgs/development/tools/rust/cargo-geiger/default.nix | |
parent | 4fc27edf074b63a46782832279f8ac1c27b43829 (diff) | |
parent | 5e70be026ee4eb05ed1c25d659848ab2f7102100 (diff) | |
download | nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.gz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.bz2 nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.lz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.xz nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.tar.zst nixpkgs-457e94d9008a55f0302100b00b77ea9ea478eaef.zip |
Merge branch 'master' into staging-next
~4k rebuilds on each Linux.
Diffstat (limited to 'pkgs/development/tools/rust/cargo-geiger/default.nix')
-rw-r--r-- | pkgs/development/tools/rust/cargo-geiger/default.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 2512a9ec4f4..70601faaf6d 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchFromGitHub -, rustPlatform, pkgconfig -, openssl, Security }: +, rustPlatform, pkgconfig, openssl +# darwin dependencies +, Security, CoreFoundation, libiconv +}: rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; @@ -26,9 +28,16 @@ rustPlatform.buildRustPackage rec { --skip test_package::case_6 ''; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; nativeBuildInputs = [ pkgconfig ]; + # FIXME: Use impure version of CoreFoundation because of missing symbols. + # CFURLSetResourcePropertyForKey is defined in the headers but there's no + # corresponding implementation in the sources from opensource.apple.com. + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" + ''; + meta = with lib; { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; homepage = https://github.com/anderejd/cargo-geiger; |