git.iko.soy/typeable/nixpkgs
on master help sign in
defaultCrateOverrides: move pkgconfig to nativeBuildInputs

This fixes cross-compiling.

commita0e76135098c49dca420cc04e91c61cf941eedbd authorBen Wolsieffer <benwolsieffer@gmail.com> dateSun 27 Sep 2020, 18:52 (6 years ago) parent295a669
1 file changed+20−10
pkgs/build-support/rust/default-crate-overrides.nix+20−10
pkgs/build-support/rust/default-crate-overrides.nix+20−10
@@ -16,18 +16,21 @@ in
1616 };
1717
1818 libz-sys = attrs: {
19− buildInputs = [ pkgconfig zlib ];
19+ nativeBuildInputs = [ pkgconfig ];
20+ buildInputs = [ zlib ];
2021 extraLinkFlags = ["-L${zlib.out}/lib"];
2122 };
2223
2324 curl-sys = attrs: {
24− buildInputs = [ pkgconfig zlib curl ];
25+ nativeBuildInputs = [ pkgconfig ];
26+ buildInputs = [ zlib curl ];
2527 propagatedBuildInputs = [ curl zlib ];
2628 extraLinkFlags = ["-L${zlib.out}/lib"];
2729 };
2830
2931 dbus = attrs: {
30− buildInputs = [ pkgconfig dbus ];
32+ nativeBuildInputs = [ pkgconfig ];
33+ buildInputs = [ dbus ];
3134 };
3235
3336 foundationdb-sys = attrs: {
@@ -62,19 +65,23 @@ in
6265
6366 libgit2-sys = attrs: {
6467 LIBGIT2_SYS_USE_PKG_CONFIG = true;
65− buildInputs = [ pkgconfig openssl zlib libgit2 ];
68+ nativeBuildInputs = [ pkgconfig ];
69+ buildInputs = [ openssl zlib libgit2 ];
6670 };
6771
6872 libsqlite3-sys = attrs: {
69− buildInputs = [ pkgconfig sqlite ];
73+ nativeBuildInputs = [ pkgconfig ];
74+ buildInputs = [ sqlite ];
7075 };
7176
7277 libssh2-sys = attrs: {
73− buildInputs = [ pkgconfig openssl zlib libssh2 ];
78+ nativeBuildInputs = [ pkgconfig ];
79+ buildInputs = [ openssl zlib libssh2 ];
7480 };
7581
7682 libdbus-sys = attrs: {
77− buildInputs = [ pkgconfig dbus ];
83+ nativeBuildInputs = [ pkgconfig ];
84+ buildInputs = [ dbus ];
7885 };
7986
8087 openssl = attrs: {
@@ -82,11 +89,13 @@ in
8289 };
8390
8491 openssl-sys = attrs: {
85− buildInputs = [ pkgconfig openssl ];
92+ nativeBuildInputs = [ pkgconfig ];
93+ buildInputs = [ openssl ];
8694 };
8795
8896 pq-sys = attr: {
89− buildInputs = [ pkgconfig postgresql ];
97+ nativeBuildInputs = [ pkgconfig ];
98+ buildInputs = [ postgresql ];
9099 };
91100
92101 rink = attrs: {
@@ -103,7 +112,8 @@ in
103112 };
104113
105114 thrussh-libsodium = attrs: {
106− buildInputs = [ pkgconfig libsodium ];
115+ nativeBuildInputs = [ pkgconfig ];
116+ buildInputs = [ libsodium ];
107117 };
108118
109119 xcb = attrs: {