git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #99050 from lopsided98/buildrustcrate-cross

buildRustCrate: support cross compilation

commitcffc0eaa98a51bd952a8fdff9d48dbe167a16bbe authorJohn Ericson <git@JohnEricson.me> dateTue 29 Sep 2020, 00:13 (6 years ago) parentea43b22a0e7613
2 files changed+29−13
pkgs/build-support/rust/build-rust-crate/default.nix+9−3 pkgs/build-support/rust/default-crate-overrides.nix+20−10
pkgs/build-support/rust/build-rust-crate/default.nix+9−3
@@ -4,7 +4,8 @@
44# This can be useful for deploying packages with NixOps, and to share
55# binary dependencies between projects.
66
7−{ lib, stdenv, defaultCrateOverrides, fetchCrate, rustc, rust, cargo, jq }:
7+{ lib, stdenv, defaultCrateOverrides, fetchCrate, pkgsBuildBuild, rustc, rust
8+, cargo, jq }:
89
910let
1011 # This doesn't appear to be officially documented anywhere yet.
@@ -83,6 +84,8 @@ in
8384 # A list of rust/cargo features to enable while building the crate.
8485 # Example: [ "std" "async" ]
8586 , features
87+ # Additional native build inputs for building this crate.
88+ , nativeBuildInputs
8689 # Additional build inputs for building this crate.
8790 #
8891 # Example: [ pkgs.openssl ]
@@ -188,12 +191,13 @@ let crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: {}) crateOverr
188191 dependencies_ = dependencies;
189192 buildDependencies_ = buildDependencies;
190193 processedAttrs = [
191− "src" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
194+ "src" "nativeBuildInputs" "buildInputs" "crateBin" "crateLib" "libName" "libPath"
192195 "buildDependencies" "dependencies" "features" "crateRenames"
193196 "crateName" "version" "build" "authors" "colors" "edition"
194197 "buildTests"
195198 ];
196199 extraDerivationAttrs = builtins.removeAttrs crate processedAttrs;
200+ nativeBuildInputs_ = nativeBuildInputs;
197201 buildInputs_ = buildInputs;
198202 extraRustcOpts_ = extraRustcOpts;
199203 buildTests_ = buildTests;
@@ -225,7 +229,8 @@ stdenv.mkDerivation (rec {
225229 src = crate.src or (fetchCrate { inherit (crate) crateName version sha256; });
226230 name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}";
227231 version = crate.version;
228− depsBuildBuild = [ rust stdenv.cc cargo jq ];
232+ depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ];
233+ nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or []) ++ nativeBuildInputs_;
229234 buildInputs = (crate.buildInputs or []) ++ buildInputs_;
230235 dependencies = map lib.getLib dependencies_;
231236 buildDependencies = map lib.getLib buildDependencies_;
@@ -301,6 +306,7 @@ stdenv.mkDerivation (rec {
301306 verbose = crate_.verbose or true;
302307 extraRustcOpts = [];
303308 features = [];
309+ nativeBuildInputs = [];
304310 buildInputs = [];
305311 crateOverrides = defaultCrateOverrides;
306312 preUnpack = crate_.preUnpack or "";
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: {