diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-01 09:42:54 +0200 |
| commit | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (patch) | |
| tree | adbc42e629ea3441456eb5e5e4e0b3a7fa2d867a /pkgs/build-support/rust | |
| parent | f498a8b7af41401c167baa6879a8b0271e8ffbf5 (diff) | |
| parent | ff13b6f1acceac062e66a2b0f39a59bcb5570a87 (diff) | |
| download | nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.gz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.bz2 nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.lz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.xz nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.tar.zst nixlib-55e4555b77ff7506579c1d4f5d9b562ca6e853b4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/rust')
| -rw-r--r-- | pkgs/build-support/rust/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 762a61b8a579..6afe93c7e4c1 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -14,6 +14,7 @@ , cargoDepsHook ? "" , cargoBuildFlags ? [] , buildType ? "release" +, meta ? {} , cargoVendorDir ? null , ... } @ args: @@ -45,7 +46,6 @@ let ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}"; - in stdenv.mkDerivation (args // { inherit cargoDeps; @@ -103,7 +103,7 @@ in stdenv.mkDerivation (args // { "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \ "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \ cargo build \ - --${buildType} \ + ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${stdenv.hostPlatform.config} \ --frozen ${concatStringsSep " " cargoBuildFlags} ) @@ -147,4 +147,9 @@ in stdenv.mkDerivation (args // { ''; passthru = { inherit cargoDeps; } // (args.passthru or {}); + + meta = { + # default to Rust's platforms + platforms = rustc.meta.platforms; + } // meta; }) |