diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-10 15:14:49 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-06-11 10:35:14 -0700 |
| commit | 0e8e7968d1528ed4df50d6b86e0079ba94ccaf63 (patch) | |
| tree | 55dc9b91ee17fdfd943278bd0bc32496643394d0 /pkgs/os-specific/linux/nixos-rebuild | |
| parent | ea5956a2ed03bcd34b6d269cbb6613db47d9a957 (diff) | |
| download | nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar.gz nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar.bz2 nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar.lz nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar.xz nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.tar.zst nixlib-0e8e7968d1528ed4df50d6b86e0079ba94ccaf63.zip | |
nixos-rebuild: prevent masking return value with declaration
Diffstat (limited to 'pkgs/os-specific/linux/nixos-rebuild')
| -rw-r--r-- | pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index c47a3b7c522e..85df4ffb44b8 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -171,6 +171,7 @@ nixBuild() { else local instArgs=() local buildArgs=() + local drv= while [ "$#" -gt 0 ]; do local i="$1"; shift 1 @@ -197,7 +198,7 @@ nixBuild() { esac done - local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" + drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix-copy-closure --to "$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" @@ -217,6 +218,8 @@ nixFlakeBuild() { shift 1 local evalArgs=() local buildArgs=() + local drv= + while [ "$#" -gt 0 ]; do local i="$1"; shift 1 case "$i" in @@ -238,7 +241,7 @@ nixFlakeBuild() { esac done - local drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" + drv="$(nix "${flakeFlags[@]}" eval --raw "${attr}.drvPath" "${evalArgs[@]}" "${extraBuildArgs[@]}")" if [ -a "$drv" ]; then NIX_SSHOPTS=$SSHOPTS nix "${flakeFlags[@]}" copy --derivation --to "ssh://$buildHost" "$drv" buildHostCmd nix-store -r "$drv" "${buildArgs[@]}" |