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:29:33 -0400 |
| commit | 243e28bc96db0827eebfe2769de7e4393f791ca0 (patch) | |
| tree | 5cb6cf4a033c0651d6ad96e33124e2878263b972 | |
| parent | f3a114e088658786cfd5de5b2aa3e7cba9e96c64 (diff) | |
| download | nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar.gz nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar.bz2 nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar.lz nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar.xz nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.tar.zst nixpkgs-243e28bc96db0827eebfe2769de7e4393f791ca0.zip | |
nix-daemon: only add channels dir to NIX_PATH if exists
Per reviewer comment (thanks!).
| -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 9a8ca6f43bf..24379ec2735 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); |