modules/rosenthal/packages/networking.scm

@@ -319,26 +319,6 @@ a SOCKS5 proxy.")
                    "derpprobe"
                    "tailscaled"
                    "tsidp")))))
-          (add-after 'unpack 'fix-paths
-            (lambda _
-              (substitute* "ssh/tailssh/user.go"
-                (((format #f "(\")(~a|~a\")"
-                          (string-join
-                           '("/usr/local/sbin"
-                             "/usr/local/bin"
-                             "/usr/sbin"
-                             "/usr/bin"
-                             "/sbin"
-                             "/bin")
-                           ":")
-                          (string-join
-                           '("/usr/local/bin"
-                             "/usr/bin"
-                             "/bin")
-                           ":"))
-                  _ prefix suffix)
-                 (format #f "~a/run/current-system/profile/bin:~a"
-                         prefix suffix)))))
           (add-after 'install 'install-extras
             (lambda _
               (symlink (in-vicinity #$output "bin/tailscaled")

modules/rosenthal/services/networking.scm

@@ -107,6 +107,10 @@
    (file-like tailscale)
    "The tailscale package to use.")
 
+  (iptables
+   (file-like iptables-nft)
+   "The iptables package to use.")
+
   (log-file
    (string "/var/log/tailscaled.log")
    "Path to log file.")
@@ -137,8 +141,14 @@ to #f.")
 
 (define tailscale-shepherd-service
   (match-record-lambda <tailscale-configuration>
-      (tailscale log-file socket state-directory
+      (tailscale iptables log-file socket state-directory
                  upload-log? verbosity extra-options)
+    (let ((environment
+           #~(list (string-append "PATH="
+                                  (string-join
+                                   '(#$(file-append iptables "/sbin")
+                                     #$(file-append iproute "/sbin"))
+                                   ":")))))
       (list (shepherd-service
              (documentation "Run tailscaled")
              (provision '(tailscaled))
@@ -154,8 +164,9 @@ to #f.")
                   "-statedir" #$state-directory
                   "-verbose" #$(number->string verbosity)
                   #$@extra-options)
+                 #:environment-variables #$environment
                  #:log-file #$log-file))
-            (stop #~(make-kill-destructor))))))
+             (stop #~(make-kill-destructor)))))))
 
 (define tailscale-service-type
   (service-type