[regenerate_cargo_nix.sh] explicit build tool to exit early on failure

nix-community · Jan 4, 2024 · 360d2a6 · 360d2a6
1 parent 5b66cd7
commit 360d2a6
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/regenerate_cargo_nix.sh b/regenerate_cargo_nix.sh
@@ -53,13 +53,12 @@ else
   echo "Skipping because of --no-cargo-build"
 fi
 
-crate2nix=$(noisily nix-build --arg release false $NIX_OPTIONS)/bin/crate2nix
+noisily nix-build --arg release false $NIX_OPTIONS
+crate2nix=$(nix-build --arg release false $NIX_OPTIONS)/bin/crate2nix
 noisily "$crate2nix" generate -n ../nix/nixpkgs.nix \
   -f ./crate2nix/Cargo.toml -o ./crate2nix/Cargo.nix || \
      { echo "Regeneration of ./Cargo.nix failed." >&2 ; exit 1; }
 
-crate2nix=$(noisily nix-build --arg release false $NIX_OPTIONS)/bin/crate2nix
-
 nix-instantiate tests.nix --eval --strict --json -A buildTestConfigs | \
  jq -r .[].pregeneratedBuild | \
  while read cargo_nix; do