diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-09-27 18:52:56 -0400 |
---|---|---|
committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-09-28 19:47:52 -0400 |
commit | a0e76135098c49dca420cc04e91c61cf941eedbd (patch) | |
tree | e74c44585233d0b6e83f0931660ffa51795828d7 /pkgs/build-support/rust | |
parent | 295a6690f9d98ec81b4f6ef10a9230d49f0d8c42 (diff) | |
download | nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar.gz nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar.bz2 nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar.lz nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar.xz nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.tar.zst nixpkgs-a0e76135098c49dca420cc04e91c61cf941eedbd.zip |
defaultCrateOverrides: move pkgconfig to nativeBuildInputs
This fixes cross-compiling.
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r-- | pkgs/build-support/rust/default-crate-overrides.nix | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 1c4fe9daead..d0e69ad698a 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -16,18 +16,21 @@ in }; libz-sys = attrs: { - buildInputs = [ pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; curl-sys = attrs: { - buildInputs = [ pkgconfig zlib curl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; dbus = attrs: { - buildInputs = [ pkgconfig dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus ]; }; foundationdb-sys = attrs: { @@ -62,19 +65,23 @@ in libgit2-sys = attrs: { LIBGIT2_SYS_USE_PKG_CONFIG = true; - buildInputs = [ pkgconfig openssl zlib libgit2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl zlib libgit2 ]; }; libsqlite3-sys = attrs: { - buildInputs = [ pkgconfig sqlite ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sqlite ]; }; libssh2-sys = attrs: { - buildInputs = [ pkgconfig openssl zlib libssh2 ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl zlib libssh2 ]; }; libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus ]; }; openssl = attrs: { @@ -82,11 +89,13 @@ in }; openssl-sys = attrs: { - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; }; pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql ]; }; rink = attrs: { @@ -103,7 +112,8 @@ in }; thrussh-libsodium = attrs: { - buildInputs = [ pkgconfig libsodium ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsodium ]; }; xcb = attrs: { |