diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2018-09-04 14:22:20 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2018-09-04 16:19:35 +0200 |
| commit | 31919bce6ba59e7fb117b34bd2b1f460ef208053 (patch) | |
| tree | b71b867e81e4a77e00ca6adc9ecc3dc080dc57cd | |
| parent | 45ec8534b1ddb7ce1ac45e671fbc26fae04eea48 (diff) | |
| download | nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar.gz nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar.bz2 nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar.lz nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar.xz nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.tar.zst nixlib-31919bce6ba59e7fb117b34bd2b1f460ef208053.zip | |
nix-daemon service: Ensure `ssh` is on PATH. Fixes #46038.
This fixes a regression introduced in commit 700e21d6dac4683ef40f20127a6eb2a74b9bd8c6 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>
| -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 c0eb882c58f3..ec56e75992be 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -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 |