From ff3b3e696ad0f4ea2cc8a8f4e030794742a36a50 Mon Sep 17 00:00:00 2001
From: Samuel Gräfenstein <git@samuelgrf.com>
Date: Sun, 23 May 2021 02:07:03 +0200
Subject: nixos-rebuild: fix creating ./result symlink for flakes

---
 pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh

(limited to 'pkgs/os-specific/linux/nixos-rebuild')

diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
old mode 100644
new mode 100755
index 5522fa6a456..d6853bf4729
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -210,7 +210,12 @@ nixBuild() {
 }
 
 nixFlakeBuild() {
-    if [ -z "$buildHost" ]; then
+    if [[ -z "$buildHost" && -z "$targetHost" ]] &&
+       ! [ "$action" = switch -o "$action" = boot ]
+    then
+        nix "${flakeFlags[@]}" build "$@"
+        readlink -f ./result
+    elif [ -z "$buildHost" ]; then
         nix "${flakeFlags[@]}" build "$@" --out-link "${tmpDir}/result"
         readlink -f "${tmpDir}/result"
     else
-- 
cgit 1.4.1