diff options
| author | Will Dietz <w@wdtz.org> | 2018-09-28 14:53:04 -0500 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2018-09-29 20:34:13 -0400 |
| commit | 4c3a0ae44566b74ba4114e991f0e2ee0552caa87 (patch) | |
| tree | 14f85c2a6b1d0c7cc8f8f55c0551ab6a33cc38b1 /nixos/modules | |
| parent | aa0c7bd5ed059e0f7278bacc63c3e4b0aab7d991 (diff) | |
nix-daemon: only add channels dir to NIX_PATH if exists
Per reviewer comment (thanks!). (cherry picked from commit 243e28bc96db0827eebfe2769de7e4393f791ca0)
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 9a8ca6f43bfe4..24379ec273548 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); |