From 2d4d54133442e275f2db2d3d6432d03047ab5176 Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Mon, 27 Jun 2022 13:15:35 +0200
Subject: [PATCH] Sprinkle --extra-experimental-features nix-command

---
 modules/environment/login/login-inner.nix | 6 ++++--
 nix-on-droid/nix-on-droid.sh              | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix
index 2440a73..d213b22 100644
--- a/modules/environment/login/login-inner.nix
+++ b/modules/environment/login/login-inner.nix
@@ -44,8 +44,10 @@ writeText "login-inner" ''
       ${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix
 
       echo "Installing first nix-on-droid generation..."
-      ${nix}/bin/nix build --no-link --file "<nix-on-droid>" nix-on-droid
-      $(${nix}/bin/nix path-info --file "<nix-on-droid>" nix-on-droid)/bin/nix-on-droid switch
+      ${nix}/bin/nix --extra-experimental-features nix-command \
+        build --no-link --file "<nix-on-droid>" nix-on-droid
+      $(${nix}/bin/nix --extra-experimental-features nix-command \
+        path-info --file "<nix-on-droid>" nix-on-droid)/bin/nix-on-droid switch
 
       echo
       echo "Congratulations! Now you have Nix installed with some default packages like bashInteractive, \
diff --git a/nix-on-droid/nix-on-droid.sh b/nix-on-droid/nix-on-droid.sh
index 72e7d0a..6fa28ab 100644
--- a/nix-on-droid/nix-on-droid.sh
+++ b/nix-on-droid/nix-on-droid.sh
@@ -25,7 +25,9 @@ function setupPasstroughOpts() {
 
 function nixActivationPackage() {
     local command="$1"
-    local extraArgs=("${@:2}" "${PASSTHROUGH_OPTS[@]}")
+    local extraArgs=("${@:2}"
+                     --extra-experimental-features nix-command
+                     "${PASSTHROUGH_OPTS[@]}")
     local nix=nix
     if [[ -n "${FLAKE_CONFIG_URI}" ]]; then
         nix=@nixge24@/bin/nix