git.iko.soy/typeable/nixpkgs
on master help sign in
buildRustCrate: support cross compilation
commit295a6690f9d98ec81b4f6ef10a9230d49f0d8c42 authorBen Wolsieffer <benwolsieffer@gmail.com> dateMon 28 Sep 2020, 19:46 (6 years ago) parent670fe11
1 file changed+9−3
pkgs/build-support/rust/build-rust-crate/default.nix+9−3
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 "";