From fe064a639319ed61cdf12b8f6eded9523abcc498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 Mar 2024 15:57:23 +0100 Subject: [PATCH] use nom-build if available Nicer progress bars etc --- disko | 10 +++++++++- disko-install | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/disko b/disko index 94ca2fe..807c4e1 100755 --- a/disko +++ b/disko @@ -104,6 +104,14 @@ while [[ $# -gt 0 ]]; do shift done +nixBuild() { + if command -v nom-build > /dev/null; then + nom-build "$@" + else + nix-build "$@" + fi +} + if ! { [[ $mode = "format" ]] || [[ $mode = "mount" ]] || [[ $mode = "disko" ]] || [[ $mode = "create" ]] || [[ $mode = "zap_create_mount" ]] ; }; then abort "mode must be either format, mount or disko" fi @@ -131,7 +139,7 @@ else fi # The "--impure" is still pure, as the path is within the nix store. -script=$(nix-build "${libexec_dir}"/cli.nix \ +script=$(nixBuild "${libexec_dir}"/cli.nix \ --no-out-link \ --impure \ --argstr mode "$mode" \ diff --git a/disko-install b/disko-install index fde0598..55fa50a 100755 --- a/disko-install +++ b/disko-install @@ -139,6 +139,14 @@ cleanupMountPoint() { rmdir "${mountPoint}" } +nixBuild() { + if command -v nom-build > /dev/null; then + nom-build "$@" + else + nix-build "$@" + fi +} + main() { parseArgs "$@" @@ -168,7 +176,7 @@ main() { # shellcheck disable=SC2064 trap "cleanupMountPoint ${escapeMountPoint}" EXIT - outputs=$(nix-build "${libexec_dir}"/install-cli.nix \ + outputs=$(nixBuild "${libexec_dir}"/install-cli.nix \ "${nix_args[@]}" \ --no-out-link \ --impure \