From 682de76b1e5c9d228670bce8e584def6011a57d2 Mon Sep 17 00:00:00 2001
From: Wigger Boelens <me@wigger.email>
Date: Mon, 3 Nov 2025 15:54:39 +0100
Subject: [PATCH] dnsmasq: make the daemon wait for the nix store to be mounted

This resolves the issue of the daemon not starting because the nix store is not yet mounted

Signed-off-by: Wigger Boelens <me@wigger.email>
---
 modules/services/dnsmasq.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/services/dnsmasq.nix b/modules/services/dnsmasq.nix
index 61440e4..c5108bd 100644
--- a/modules/services/dnsmasq.nix
+++ b/modules/services/dnsmasq.nix
@@ -69,13 +69,15 @@ in
     environment.systemPackages = [ cfg.package ];
 
     launchd.daemons.dnsmasq = {
-      serviceConfig.ProgramArguments = [
-        "${cfg.package}/bin/dnsmasq"
-        "--listen-address=${cfg.bind}"
-        "--port=${toString cfg.port}"
-        "--keep-in-foreground"
-      ] ++ (mapA (domain: addr: "--address=/${domain}/${addr}") cfg.addresses)
-        ++ (map (server: "--server=${server}") cfg.servers);
+      command = let
+        args = [
+          "--listen-address=${cfg.bind}"
+          "--port=${toString cfg.port}"
+          "--keep-in-foreground"
+        ] ++ (mapA (domain: addr: "--address=/${domain}/${addr}") cfg.addresses)
+          ++ (map (server: "--server=${server}") cfg.servers);
+      in
+        "${cfg.package}/bin/dnsmasq ${concatStringsSep " " args}";
 
       serviceConfig.KeepAlive = true;
       serviceConfig.RunAtLoad = true;