From 832662972c6a706ed0ba75196dafad1665cf68ba Mon Sep 17 00:00:00 2001
From: Ryan Cao <70191398+ryanccn@users.noreply.github.com>
Date: Thu, 28 Nov 2024 15:14:48 +0800
Subject: [PATCH] fix: use `--option` for setting experimental features

---
 src/cli/uninstall.rs | 7 +++----
 src/stages/build.rs  | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/cli/uninstall.rs b/src/cli/uninstall.rs
index 8edc6e1..9fdb97a 100644
--- a/src/cli/uninstall.rs
+++ b/src/cli/uninstall.rs
@@ -36,10 +36,9 @@ fn build_uninstall_system() -> Result<PathBuf> {
             "--impure",
             "--json",
             "--no-link",
-            "--extra-experimental-features",
-            "nix-command",
-            "--extra-experimental-features",
-            "flakes",
+            "--option",
+            "extra-experimental-features",
+            "nix-command flakes",
             "--expr",
         ])
         .arg(&expr_template)
diff --git a/src/stages/build.rs b/src/stages/build.rs
index 08d4066..f1260f0 100644
--- a/src/stages/build.rs
+++ b/src/stages/build.rs
@@ -31,10 +31,9 @@ pub fn build(
             "build",
             "--json",
             "--no-link",
-            "--extra-experimental-features",
-            "nix-command",
-            "--extra-experimental-features",
-            "flakes",
+            "--option",
+            "extra-experimental-features",
+            "nix-command flakes",
         ])
         .args(extra_build_flags)
         .args(["--", &format!("{flake_url}#{flake_attr}.system")])