From 9001480e03ab8c957716e2bf164bbde605472399 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 1 Oct 2023 21:19:33 +0200
Subject: Add a flag for building with nix-output-monitor

all this does is to replace the build invocations of nix/nix-build
with nom/nom-build (of https://github.com/maralorn/nix-output-monitor)
which gives more structured output of the running build.
---
 src/push.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/push.rs')

diff --git a/src/push.rs b/src/push.rs
index c800a98..2d34436 100644
--- a/src/push.rs
+++ b/src/push.rs
@@ -57,6 +57,7 @@ pub struct PushProfileData<'a> {
     pub keep_result: bool,
     pub result_path: Option<&'a str>,
     pub extra_build_args: &'a [String],
+    pub use_nom: bool,
 }
 
 pub async fn build_profile_locally(data: &PushProfileData<'_>, derivation_name: &str) -> Result<(), PushProfileError> {
@@ -66,9 +67,9 @@ pub async fn build_profile_locally(data: &PushProfileData<'_>, derivation_name:
     );
 
     let mut build_command = if data.supports_flakes {
-        Command::new("nix")
+        Command::new(if data.use_nom {"nom"} else {"nix"})
     } else {
-        Command::new("nix-build")
+        Command::new(if data.use_nom {"nom-build"} else {"nix-build"})
     };
 
     if data.supports_flakes {
@@ -184,7 +185,7 @@ pub async fn build_profile_remotely(data: &PushProfileData<'_>, derivation_name:
         a => return Err(PushProfileError::CopyExit(a)),
     };
 
-    let mut build_command = Command::new("nix");
+    let mut build_command = Command::new(if data.use_nom {"nom"} else {"nix"});
     build_command
         .arg("build").arg(derivation_name)
         .arg("--eval-store").arg("auto")
-- 
cgit v1.2.3