From da492d230b426a56da1a48ff1003dd0ff1d118e7 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 21 Jul 2019 00:00:00 -0500
Subject: buildRustPackage: by default use Rust's platforms

---
 pkgs/build-support/rust/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'pkgs/build-support/rust')

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 762a61b8a579..306b70419ed1 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:
@@ -147,4 +148,9 @@ in stdenv.mkDerivation (args // {
   '';
 
   passthru = { inherit cargoDeps; } // (args.passthru or {});
+
+  meta = {
+    # default to Rust's platforms
+    platforms = rustc.meta.platforms;
+  } // meta;
 })
-- 
cgit 1.4.1


From 4403d44763a1f8fb2bae6fd844406a47b99abf3b Mon Sep 17 00:00:00 2001
From: Adelbert Chang <Adelbert.Chang@target.com>
Date: Wed, 31 Jul 2019 05:19:01 -0700
Subject: buildRustPackage: fix cargo flag for release/debug build (#61521)

Previous behavior did not actually allow for "debug" build as it would
try to pass --debug to cargo, which is not a valid flag.
---
 pkgs/build-support/rust/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'pkgs/build-support/rust')

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 306b70419ed1..6afe93c7e4c1 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -46,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;
 
@@ -104,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}
     )
-- 
cgit 1.4.1