From 62d1e8dec798b0bbe1c9e7b781be8b0730d4b140 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 2 Jan 2019 12:20:23 +0100
Subject: [PATCH] nix/os/devices: never use sudo for remote targets

---
 nix/os/devices/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nix/os/devices/default.nix b/nix/os/devices/default.nix
index 3697a45..b361188 100644
--- a/nix/os/devices/default.nix
+++ b/nix/os/devices/default.nix
@@ -18,11 +18,13 @@ let
 
     [[ -e "''${NIXOS_CONFIG}" ]]
 
-    ${if (builtins.elem rebuildarg rebuildargsSudo) then
+    ${if (builtins.elem rebuildarg rebuildargsSudo)
+          && builtins.match ".*--target-host.*" moreargs == null
+    then
       "sudo -E \\"
     else
       ""
-      }
+    }
     nixos-rebuild --show-trace -I nixos-config=''${NIXOS_CONFIG} ${rebuildarg} ${moreargs}
     if test -L result; then
       rm result