diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-08-03 20:14:28 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-08-03 20:16:43 +0200 |
| commit | 958ebb7966c1bc17d72085be021b3f7ef1cbdd99 (patch) | |
| tree | 4c4fc990720e44341579065d4e65febb152317e7 | |
| parent | f6970956c3e7f03c419d737ab4ec4fa86a9eeb72 (diff) | |
darwin-rebuild: don't run nix-build for edit
| -rw-r--r-- | pkgs/nix-tools/darwin-rebuild.sh | 10 |
1 files 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 "<darwin-config>") + exec ${EDITOR:-nano} "$darwinConfig" +fi + if ! [ "$action" = list -o "$action" = rollback ]; then echo "building the system configuration..." >&2 systemConfig="$(nix-build '<darwin>' ${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 "<darwin-config>") - ${EDITOR:-nano} "$darwinConfig" -fi |