summary refs log tree commit diff
path: root/pkgs/build-support/rust
diff options
context:
space:
mode:
authorAdelbert Chang <Adelbert.Chang@target.com>2019-07-31 05:19:01 -0700
committerJörg Thalheim <Mic92@users.noreply.github.com>2019-07-31 13:19:01 +0100
commit4403d44763a1f8fb2bae6fd844406a47b99abf3b (patch)
tree55f383ae75c34ef01401744f30754d9adbc57a56 /pkgs/build-support/rust
parent4bcc6e11d353d4881e03a0a4166df4d8e3792f01 (diff)
downloadnixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar.gz
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar.bz2
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar.lz
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar.xz
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.tar.zst
nixpkgs-4403d44763a1f8fb2bae6fd844406a47b99abf3b.zip
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.
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r--pkgs/build-support/rust/default.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 306b70419ed..6afe93c7e4c 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}
     )