diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 14:47:02 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 14:50:07 +0200 |
| commit | 9bb40b7a5b05c61bceb200e770a58fc3250ce23a (patch) | |
| tree | a530ec11a0c15da165deca7d0a54bf4cb98a108c /nixos/modules/services/misc | |
| parent | d43b536ab65baec218fe6ed513f6e0aa2bf6b3ab (diff) | |
| download | nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar.gz nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar.bz2 nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar.lz nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar.xz nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.tar.zst nixlib-9bb40b7a5b05c61bceb200e770a58fc3250ce23a.zip | |
Pull in nix-daemon.socket
This led to the container test failing, which made no sense whatsoever, until I realized nix-daemon.socket creates the socket directory as a side effect, which systemd-nspawn then bind-mounts. http://hydra.nixos.org/build/10397575
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e6528777c325..09a874481dc6 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -277,6 +277,8 @@ in systemd.packages = [ nix ]; + systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; + systemd.services.nix-daemon = { path = [ nix pkgs.openssl pkgs.utillinux pkgs.openssh ] ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; |