Unverified Commit 7016b8bf authored by Ilan Joselevich's avatar Ilan Joselevich Committed by GitHub
Browse files

Merge pull request #242076 from Kranzes/nixtmpfilesd 

nixos/nix-daemon: use tmpfiles from nixPackage when possible
parents 82673698 af8206f8

nixos/modules/services/system/nix-daemon.nix

+8 −7
Original line number Diff line number Diff line
@@ -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 = [

    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" ];