public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-rebuild: Make 'edit' work with with flakes

Browse Source
This commit is contained in:
Eelco Dolstra 2020-02-07 15:26:12 +01:00
parent c08930874a
commit 4089dbf090
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/installer/tools/nixos-rebuild.sh
View File

@ -285,10 +285,13 @@ if [[ -n $flake ]]; then
fi fi
# Find configuration.nix and open editor instead of building. # Find configuration.nix and open editor instead of building.
# FIXME: handle flakes
if [ "$action" = edit ]; then if [ "$action" = edit ]; then
NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} if [[ -z $flake ]]; then
exec "${EDITOR:-nano}" "$NIXOS_CONFIG" NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)}
exec "${EDITOR:-nano}" "$NIXOS_CONFIG"
else
exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr"
fi
exit 1 exit 1
fi fi