diff options
author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:33 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-18 03:54:38 +0300 |
commit | 003473613a084b38a1f0335ba8035461b4190e5d (patch) | |
tree | cc4598d81eb607acba0d89664fe13fd44138dd7e /pkgs/build-support | |
parent | 39696b6d56fbe93834a8997057b3507e8cd2a234 (diff) | |
parent | 50bbc56b0bd87715bc17230365fe5eb441bfac68 (diff) | |
download | nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.gz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.bz2 nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.lz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.xz nixlib-003473613a084b38a1f0335ba8035461b4190e5d.tar.zst nixlib-003473613a084b38a1f0335ba8035461b4190e5d.zip |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/rust/default-crate-overrides.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 488fcb943721..971c4d0f5e22 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -3,7 +3,7 @@ libsodium, postgresql, ... }: let - inherit (darwin.apple_sdk.frameworks) CoreFoundation; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { cargo = attrs: { @@ -19,7 +19,8 @@ in crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; curl-sys = attrs: { - buildInputs = [ pkgconfig curl ]; + buildInputs = [ pkgconfig zlib ]; + propagatedBuiltInputs = [ curl ]; }; libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; @@ -69,4 +70,7 @@ in pq-sys = attr: { buildInputs = [ pkgconfig postgresql ]; }; + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; + }; } |