From e13ac1f674af14986161feb22b2cd31d0ccfd094 Mon Sep 17 00:00:00 2001
From: jz8132543 <i@dora.im>
Date: Wed, 20 Nov 2024 01:42:20 +0800
Subject: [PATCH] fix: derper

---
 nixos/modules/base/nixpkgs.nix  | 5 ++---
 nixos/modules/services/derp.nix | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/base/nixpkgs.nix b/nixos/modules/base/nixpkgs.nix
index 07ded916..a4cf24aa 100644
--- a/nixos/modules/base/nixpkgs.nix
+++ b/nixos/modules/base/nixpkgs.nix
@@ -22,18 +22,17 @@ let
         inherit (inputs'.nix-gc-s3.packages) nix-gc-s3;
         # inherit (inputs'.headscale.packages) headscale;
         clash2sing-box = inputs'.clash2sing-box.packages.default;
-        tailscale = prev.tailscale.overrideAttrs (_old: {
+        tailscale = prev.tailscale.overrideAttrs (old: {
           # tailscale = inputs'.tailscale.packages.tailscale.overrideAttrs (old: {
           # subPackages = old.subPackages ++ [ "cmd/derper" ] ++ [ "cmd/derpprobe" ];
           subPackages = [
-            "cmd/tailscale"
             "cmd/tailscaled"
             "cmd/derper"
             "cmd/stunc"
             "cmd/hello"
           ];
           postInstall = lib.strings.concatStrings [
-            "alias ln=echo\n"
+            "cp $out/bin/derper $out/bin/derp && "
             old.postInstall
           ];
         });
diff --git a/nixos/modules/services/derp.nix b/nixos/modules/services/derp.nix
index befdd81f..3b0eb6d7 100644
--- a/nixos/modules/services/derp.nix
+++ b/nixos/modules/services/derp.nix
@@ -11,7 +11,7 @@
     serviceConfig = {
       Restart = "always";
       DynamicUser = true;
-      ExecStart = "${pkgs.tailscale}/bin/derper -a ':${toString config.ports.derp}' -stun-port ${toString config.ports.derp-stun} --hostname='${config.networking.fqdn}' -c /tmp/derper.conf -verify-clients";
+      ExecStart = "${pkgs.tailscale}/bin/derp -a ':${toString config.ports.derp}' -stun-port ${toString config.ports.derp-stun} --hostname='${config.networking.fqdn}' -c /tmp/derper.conf -verify-clients";
       # ExecStart = "${pkgs.tailscale}/bin/derper -a ':${toString config.ports.derp}' -stun-port ${toString config.ports.derp-stun} --hostname='${config.networking.fqdn}' -c /tmp/derper.conf -verify-clients -dev";
       # if !config.environment.isNAT
       # then "${pkgs.tailscale}/bin/derper -a ':${toString config.ports.derp}' -stun-port ${toString config.ports.derp-stun} --hostname='${config.networking.fqdn}' -c /tmp/derper.conf -verify-clients -dev"