diff options
author | 06kellyjac <dev@j-k.io> | 2022-05-09 18:18:27 +0100 |
---|---|---|
committer | 06kellyjac <dev@j-k.io> | 2022-05-09 18:18:27 +0100 |
commit | d0ecc348fbfe4092ce5683cf823c8661019d1c23 (patch) | |
tree | 62ae670e171922229f13bbd3ae8ba2f0af3971ce /pkgs/development/tools/rust/cargo-geiger/default.nix | |
parent | 43bccb0bdbf903387170ace61ca2abb4ac71a2a3 (diff) | |
download | nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar.gz nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar.bz2 nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar.lz nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar.xz nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.tar.zst nixpkgs-d0ecc348fbfe4092ce5683cf823c8661019d1c23.zip |
cargo-geiger: fix darwin build failures
Part of ZHF #172160
Diffstat (limited to 'pkgs/development/tools/rust/cargo-geiger/default.nix')
-rw-r--r-- | pkgs/development/tools/rust/cargo-geiger/default.nix | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 28511223be0..808fa580db3 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -1,7 +1,14 @@ -{ stdenv, lib, fetchFromGitHub -, rustPlatform, pkg-config, openssl -# darwin dependencies -, Security, CoreFoundation, libiconv +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl + # darwin dependencies +, Security +, CoreFoundation +, libiconv +, curl }: rustPlatform.buildRustPackage rec { @@ -16,15 +23,11 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-i7xDEzZAN2ubW1Q6MhY+xsb9XiUajNDHLdtDuO5r6jA="; - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - nativeBuildInputs = [ pkg-config ]; - - # 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 = lib.optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; + nativeBuildInputs = [ pkg-config ] + # curl-sys wants to run curl-config on darwin + ++ lib.optionals stdenv.isDarwin [ curl.dev ]; # skip tests with networking or other failures checkFlags = [ |