diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2018-10-11 21:51:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 21:51:37 +0200 |
| commit | c81ca5491fc97bd76b4c1561b98a338dc71c933d (patch) | |
| tree | 50f7f9ce1f541e26f7f099d5e4f99d60ce827ecb | |
| parent | c881a04a5d5f3d8a4f812e36d142434702da7b8b (diff) | |
| parent | 31919bce6ba59e7fb117b34bd2b1f460ef208053 (diff) | |
| download | nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar.gz nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar.bz2 nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar.lz nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar.xz nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.tar.zst nixlib-c81ca5491fc97bd76b4c1561b98a338dc71c933d.zip | |
Merge pull request #46041 from nh2/issue-46038-nix-daemon-ssh-path
nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038.
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 24379ec27354..5e171c08d893 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -399,8 +399,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 |