diff --git a/utils.nu b/utils.nu index 2601e915..6e7a36c9 100644 --- a/utils.nu +++ b/utils.nu @@ -27,19 +27,15 @@ export def make-editable [ # ================= macOS related ========================= -const darwin_dir = './result/sw/bin' - export def darwin-build [ name: string mode: string ] { let target = $".#darwinConfigurations.($name).system" - with-env { PATH : ($env.PATH | prepend darwin_dir) } { - if "debug" == $mode { - nom build $target --show-trace --verbose - } else { - nix build $target - } + if "debug" == $mode { + nom build $target --extra-experimental-features "nix-command flakes" --show-trace --verbose + } else { + nix build $target --extra-experimental-features "nix-command flakes" } } @@ -47,17 +43,13 @@ export def darwin-switch [ name: string mode: string ] { - with-env { PATH : ($env.PATH | prepend darwin_dir) } { - if "debug" == $mode { - darwin-rebuild switch --flake $".#($name)" --show-trace --verbose - } else { - darwin-rebuild switch --flake $".#($name)" - } + if "debug" == $mode { + ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" --show-trace --verbose + } else { + ./result/sw/bin/darwin-rebuild switch --flake $".#($name)" } } export def darwin-rollback [] { - with-env { PATH : ($env.PATH | prepend darwin_dir) } { - darwin-rebuild --rollback - } + ./result/sw/bin/darwin-rebuild --rollback }