buildRustCrate: parallize build_bin with gnu parallel

Author: lblasc

pkgs/build-support/rust/build-rust-crate/build-crate.nix

@@ -1,5 +1,6 @@
 { lib, stdenv
 , mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI, rustc
+, parallel
 }:
 
 { crateName,
@@ -71,7 +72,8 @@
        ${lib.optionalString buildTests "build_lib_test src/lib.rs"}
     fi
 
-
+    BIN_NAMES=()
+    BIN_PATHS=()
 
     ${lib.optionalString (lib.length crateBin > 0) (lib.concatMapStringsSep "\n" (bin:
     let
@@ -90,7 +92,8 @@
       '' else ''
         BIN_PATH='${bin.path}'
       ''}
-        ${build_bin} "$BIN_NAME" "$BIN_PATH"
+        BIN_NAMES+=("$BIN_NAME")
+        BIN_PATHS+=("$BIN_PATH")
     '' else ''
       echo Binary ${bin.name or crateName} not compiled due to not having all of the required features -- ${lib.escapeShellArg (builtins.toJSON bin.requiredFeatures)} -- enabled.
     '') crateBin)}
@@ -120,13 +123,39 @@
     ${lib.optionalString (lib.length crateBin == 0 && !hasCrateBin) ''
       if [[ -e src/main.rs ]]; then
         mkdir -p target/bin
-        ${build_bin} ${crateName} src/main.rs
+        BIN_NAMES+=("${crateName}")
+        BIN_PATHS+=("src/main.rs")
       fi
       for i in src/bin/*.rs; do #*/
         mkdir -p target/bin
-        ${build_bin} "$(basename $i .rs)" "$i"
+        BIN_NAMES+=("$(basename $i .rs)")
+        BIN_PATHS+=("$i")
       done
+
     ''}
+
+    export BIN_RUSTC_OPTS
+    export LINK
+    export EXTRA_LINK_ARGS
+    export EXTRA_LINK_ARGS_BINS
+    export EXTRA_LIB
+    export BUILD_OUT_DIR
+    export EXTRA_BUILD
+    export EXTRA_FEATURES
+    export EXTRA_RUSTC_FLAGS
+    export -f build_bin
+    export -f build_bin_test
+    export -f echo_build_heading
+    export -f noisily
+    export -f echo_colored
+
+    ${parallel}/bin/parallel \
+      --no-notice \
+      --link \
+      --halt-on-error 2 \
+      -j$NIX_BUILD_CORES \
+      ${build_bin} ::: ''${BIN_NAMES[@]} ::: ''${BIN_PATHS[@]}
+
     # Remove object files to avoid "wrong ELF type"
     find target -type f -name "*.o" -print0 | xargs -0 rm -f
     runHook postBuild

pkgs/build-support/rust/build-rust-crate/default.nix

@@ -13,6 +13,7 @@
 , cargo
 , jq
 , libiconv
+, parallel
 }:
 
 let
@@ -253,7 +254,7 @@ crate_: lib.makeOverridable
       hasCrateBin = crate ? crateBin;
 
       buildCrate = import ./build-crate.nix {
-        inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI;
+        inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI parallel;
         rustc = rust;
       };
     in

pkgs/build-support/rust/build-rust-crate/lib.sh

@@ -59,6 +59,10 @@ build_bin() {
     $EXTRA_RUSTC_FLAGS \
     --color ${colors} \
 
+  if [[ $? -ne 0 ]]; then
+    exit 1
+  fi
+
   if [ "$crate_name_" != "$crate_name" ]; then
     mv target/bin/$crate_name_ target/bin/$crate_name
   fi