diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-03-21 19:53:28 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-03-21 19:53:28 +0100 |
| commit | 6facca010bdbceada530ed1050db574c9bd6ef12 (patch) | |
| tree | 46a13a655baefe40e289c691ae886f10eb7ad959 /nixos/modules/services/misc/nix-daemon.nix | |
| parent | 6ae26bb3c8f192281581014f76c3115bf60d7d84 (diff) | |
| parent | 0d198e7a52c71db7b607bbcab91b3b28f7786587 (diff) | |
| download | nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar.gz nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar.bz2 nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar.lz nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar.xz nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.tar.zst nixpkgs-6facca010bdbceada530ed1050db574c9bd6ef12.zip | |
Merge #164644: nixos/nix-daemon: workaround NixOS/nix#6285
...into staging
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d56808c7564..1befd48efcd 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -708,6 +708,14 @@ in systemd.packages = [ nixPackage ]; + # Will only work once https://github.com/NixOS/nix/pull/6285 is merged + # systemd.tmpfiles.packages = [ nixPackage ]; + + # Can be dropped for Nix > https://github.com/NixOS/nix/pull/6285 + systemd.tmpfiles.rules = [ + "d /nix/var/nix/daemon-socket 0755 root root - -" + ]; + systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ]; systemd.services.nix-daemon = |