From 958ebb7966c1bc17d72085be021b3f7ef1cbdd99 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 3 Aug 2018 20:14:28 +0200 Subject: [PATCH] darwin-rebuild: don't run nix-build for edit --- pkgs/nix-tools/darwin-rebuild.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/nix-tools/darwin-rebuild.sh b/pkgs/nix-tools/darwin-rebuild.sh index 5b87569..f6946ee 100644 --- a/pkgs/nix-tools/darwin-rebuild.sh +++ b/pkgs/nix-tools/darwin-rebuild.sh @@ -95,6 +95,11 @@ if ! [ "$action" = build ]; then extraBuildFlags+=("--no-out-link") fi +if [ "$action" = edit ]; then + darwinConfig=$(nix-instantiate --eval --strict -E "") + exec ${EDITOR:-nano} "$darwinConfig" +fi + if ! [ "$action" = list -o "$action" = rollback ]; then echo "building the system configuration..." >&2 systemConfig="$(nix-build '' ${extraBuildFlags[@]} -A system)" @@ -146,8 +151,3 @@ if [ "$action" = check ]; then export checkActivation=1 $systemConfig/activate-user fi - -if [ "$action" = edit ]; then - darwinConfig=$(nix-instantiate --eval --strict -E "") - ${EDITOR:-nano} "$darwinConfig" -fi