steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/devices: fix order in rebuild script

Browse source
This commit is contained in:
steveej 2021-09-03 22:33:56 +02:00
parent 29d7b2b880
commit 66e7295da3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/os/devices/default.nix
View file

@ -26,6 +26,10 @@ let
[[ -e "''${NIXOS_CONFIG}" ]] [[ -e "''${NIXOS_CONFIG}" ]]
if test -L result; then
rm result
fi
${if (builtins.elem rebuildarg rebuildargsSudo) ${if (builtins.elem rebuildarg rebuildargsSudo)
&& (builtins.match ".*--target-host.*" moreargs) == null && (builtins.match ".*--target-host.*" moreargs) == null
then then
@ -33,10 +37,6 @@ let
else else
"" ""
} }
if test -L result; then
rm result
fi
nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs} nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
''; '';