add --no-specialisation

closes #39
viperML · Oct 17, 2023 · 303c4ff · 303c4ff
1 parent e9d099f
commit 303c4ff
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nh"
-version = "3.4.8"
+version = "3.4.9"
 edition = "2021"
 license = "EUPL-1.2"
 

diff --git a/src/interface.rs b/src/interface.rs
@@ -104,6 +104,10 @@ pub struct OsRebuildArgs {
     #[arg(long, short)]
     pub specialisation: Option<String>,
 
+    /// Don't use specialisations
+    #[arg(long, short = 'S')]
+    pub no_specialisation: bool,
+
     /// Extra arguments passed to nix build
     #[arg(last = true)]
     pub extra_args: Vec<String>,

diff --git a/src/nixos.rs b/src/nixos.rs
@@ -68,8 +68,11 @@ impl OsRebuildArgs {
 
         let current_specialisation = std::fs::read_to_string(SPEC_LOCATION).ok();
 
-        let target_specialisation =
-            current_specialisation.or_else(|| self.specialisation.to_owned());
+        let target_specialisation = if self.no_specialisation {
+            None
+        } else {
+            current_specialisation.or_else(|| self.specialisation.to_owned())
+        };
 
         debug!("target_specialisation: {target_specialisation:?}");