From 243e28bc96db0827eebfe2769de7e4393f791ca0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 28 Sep 2018 14:53:04 -0500
Subject: [PATCH] nix-daemon: only add channels dir to NIX_PATH if exists

Per reviewer comment (thanks!).
---
 nixos/modules/services/misc/nix-daemon.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 9a8ca6f43bfe..24379ec27354 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -446,7 +446,9 @@ in
             export NIX_REMOTE=daemon
         fi
       '' + ''
-        export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
+        if [ -e "$HOME/.nix-defexpr/channels" ]; then
+          export NIX_PATH="$HOME/.nix-defexpr/channels''${NIX_PATH:+:$NIX_PATH}"
+        fi
       '';
 
     nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);