Merge branch 'LnL7:master' into masterHEADmaster

1 files changed, 4 insertions, 7 deletions

diff --git a/modules/services/tailscale.nix b/modules/services/tailscale.nix
index 4135ade..e7d6b0d 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:
@@ -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} && ${cfg.package}/bin/tailscaled"
-        ];
         RunAtLoad = true;
       };
     };