Skip to content

Commit

Permalink
nix-daemon service: Ensure ssh is on PATH. Fixes NixOS#46038.
Browse files Browse the repository at this point in the history
This fixes a regression introduced in commit
  700e21d

nix needs ssh on path for the SSH substituter functionality,
not only the distributed builds functionality.

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
  • Loading branch information
nh2 committed Sep 4, 2018
1 parent 45ec853 commit 31919bc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nixos/modules/services/misc/nix-daemon.nix
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@ in
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];

systemd.services.nix-daemon =
{ path = [ nix pkgs.utillinux ]
++ optionals cfg.distributedBuilds [ config.programs.ssh.package pkgs.gzip ]
{ path = [ nix pkgs.utillinux config.programs.ssh.package ]
++ optionals cfg.distributedBuilds [ pkgs.gzip ]
++ optionals (!isNix20) [ pkgs.openssl.bin ];

environment = cfg.envVars
Expand Down

0 comments on commit 31919bc

Please sign in to comment.