From c8f136ecc555f803124af471324bc6ed1163d6dd Mon Sep 17 00:00:00 2001 From: will Date: Sun, 8 Sep 2024 19:08:52 +1000 Subject: [PATCH] Revert "fix: remove manual wait4path in nix-daemon" This reverts commit 6aec084fa5d095666e81676e78f7054c83703faa. --- modules/services/nix-daemon.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix index ce9c1894..42d31c94 100644 --- a/modules/services/nix-daemon.nix +++ b/modules/services/nix-daemon.nix @@ -44,7 +44,10 @@ in nix.useDaemon = true; launchd.daemons.nix-daemon = { - command = "${config.nix.package}/bin/nix-daemon"; + serviceConfig.ProgramArguments = [ + "/bin/sh" "-c" + "/bin/wait4path ${config.nix.package}/bin/nix-daemon && exec ${config.nix.package}/bin/nix-daemon" + ]; serviceConfig.ProcessType = config.nix.daemonProcessType; serviceConfig.LowPriorityIO = config.nix.daemonIOLowPriority; serviceConfig.Label = "org.nixos.nix-daemon"; # must match daemon installed by Nix regardless of the launchd label Prefix