rust: allow building in debug or release modes

NixOS · Mar 29, 2019 · bdd3c3f · bdd3c3f
1 parent 60761e6
commit bdd3c3f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
@@ -13,11 +13,13 @@
 , cargoUpdateHook ? ""
 , cargoDepsHook ? ""
 , cargoBuildFlags ? []
+, buildType ? "release"
 
 , cargoVendorDir ? null
 , ... } @ args:
 
 assert cargoVendorDir == null -> cargoSha256 != "unset";
+assert buildType == "release" || buildType == "debug";
 
 let
   cargoDeps = if cargoVendorDir == null
@@ -42,7 +44,7 @@ let
   cxxForBuild="${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}c++";
   ccForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
   cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++";
-  releaseDir = "target/${stdenv.hostPlatform.config}/release";
+  releaseDir = "target/${stdenv.hostPlatform.config}/${buildType}";
 
 in stdenv.mkDerivation (args // {
   inherit cargoDeps;
@@ -98,15 +100,15 @@ in stdenv.mkDerivation (args // {
       "CC_${stdenv.hostPlatform.config}"="${ccForHost}" \
       "CXX_${stdenv.hostPlatform.config}"="${cxxForHost}" \
       cargo build \
-        --release \
+        --${buildType} \
         --target ${stdenv.hostPlatform.config} \
         --frozen ${concatStringsSep " " cargoBuildFlags}
     )
 
     # rename the output dir to a architecture independent one
     mapfile -t targets < <(find "$NIX_BUILD_TOP" -type d | grep '${releaseDir}$')
     for target in "''${targets[@]}"; do
-      rm -rf "$target/../../release"
+      rm -rf "$target/../../${buildType}"
       ln -srf "$target" "$target/../../"
     done