From def1e23be848848400d1d097d4f044e3c401f9dd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sun, 14 Apr 2024 23:02:32 +0200
Subject: treewide: remove lib.mdDoc

---
 modules/services/tailscale.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/services/tailscale.nix')

diff --git a/modules/services/tailscale.nix b/modules/services/tailscale.nix
index 4135ade..3c826cf 100644
--- a/modules/services/tailscale.nix
+++ b/modules/services/tailscale.nix
@@ -13,20 +13,20 @@ in
   ];
 
   options.services.tailscale = {
-    enable = mkEnableOption (lib.mdDoc "Tailscale client daemon");
+    enable = mkEnableOption "Tailscale client daemon";
 
     package = mkOption {
       type = types.package;
       default = pkgs.tailscale;
       defaultText = literalExpression "pkgs.tailscale";
-      description = lib.mdDoc "The package to use for tailscale";
+      description = "The package to use for tailscale";
     };
 
     overrideLocalDns = mkOption {
       type = types.bool;
       default = false;
       example = true;
-      description = lib.mdDoc ''
+      description = ''
         This option implements `Override local DNS` as it is not yet implemented in Tailscaled-on-macOS.
 
         To use this option, in the Tailscale control panel:
-- 
cgit v1.2.3


From 034c45dd0cac806b527e64c143020676e1070769 Mon Sep 17 00:00:00 2001
From: will <will.bradshaw50@gmail.com>
Date: Sat, 31 Aug 2024 18:27:10 +1000
Subject: feat: use wait4path with script launchd option

addresses https://github.com/LnL7/nix-darwin/issues/1043

fix: use exec in launchd daemon config

fix: dont use a script thats in the nix store

fix: remove manual wait4path in linux-builder

fix: remove manual wait4path in karabiner elements

fix: remove manual wait4path in nix-daemon

fix: remove manual wait4path in nix-optimise

fix: remove manual wait4path in tailscaled

fix: autossh test

Revert "fix: remove manual wait4path in nix-daemon"

This reverts commit 6aec084fa5d095666e81676e78f7054c83703faa.

fix: remove bad exec

Reapply "fix: remove manual wait4path in nix-daemon"

This reverts commit c8f136ecc555f803124af471324bc6ed1163d6dd.

fix: update autossh test

to reflect changes in f86e6133d957becb1958da638516b0860fbd7491

fix: services-activate-system-changed-label-prefix test

fix: services-buildkite-agent test

fix: services-activate-system test

fix: escape ampersand

fix: services-lorri test

fix: services-nix-optimise test

fix: services-nix-gc test

refactor: use script rather than command in daemon

fix: use config.command for clarity

style: fix indentation

fix: use lib.getExe rather than directly pointing to file

revert: a87fc7bbbbdb7c25c5ad6721c93990ea035affdd

- mistaken refactor meant that service waited for nix store and not the relevant path
---
 modules/services/tailscale.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'modules/services/tailscale.nix')

diff --git a/modules/services/tailscale.nix b/modules/services/tailscale.nix
index 3c826cf..e7d6b0d 100644
--- a/modules/services/tailscale.nix
+++ b/modules/services/tailscale.nix
@@ -54,12 +54,9 @@ in
     launchd.daemons.tailscaled = {
       # derived from
       # https://github.com/tailscale/tailscale/blob/main/cmd/tailscaled/install_darwin.go#L30
+      command = lib.getExe' cfg.package "tailscaled";
       serviceConfig = {
         Label = "com.tailscale.tailscaled";
-        ProgramArguments = [
-          "/bin/sh" "-c"
-          "/bin/wait4path ${cfg.package} &amp;&amp; ${cfg.package}/bin/tailscaled"
-        ];
         RunAtLoad = true;
       };
     };
-- 
cgit v1.2.3