dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #242076 from Kranzes/nixtmpfilesd

Browse Source 
nixos/nix-daemon: use tmpfiles from nixPackage when possible
This commit is contained in:
Ilan Joselevich 2023-07-07 23:53:27 +03:00 committed by GitHub
commit 7016b8bf7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/system/nix-daemon.nix
View File

@ -168,13 +168,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.tmpfiles =
if (isNixAtLeast "2.8") then {
packages = [ nixPackage ];
} else {
rules = [
"d /nix/var/nix/daemon-socket 0755 root root - -"
];
};
systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];