From 519a71edc35ac651bd6132272b8beb087c06984d Mon Sep 17 00:00:00 2001 From: FlafyDev Date: Sun, 23 Jul 2023 04:16:04 +0300 Subject: [PATCH] nixos/nix-daemon: change regular if to mkIf --- nixos/modules/services/system/nix-daemon.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 0d6bec888395..c9df20196dbd 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -168,14 +168,16 @@ in systemd.packages = [ nixPackage ]; - systemd.tmpfiles = - if (isNixAtLeast "2.8") then { + systemd.tmpfiles = mkMerge [ + (mkIf (isNixAtLeast "2.8") { packages = [ nixPackage ]; - } else { + }) + (mkIf (!isNixAtLeast "2.8") { rules = [ "d /nix/var/nix/daemon-socket 0755 root root - -" ]; - }; + }) + ]; systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];