diff --git a/nixos/modules/base/nixpkgs.nix b/nixos/modules/base/nixpkgs.nix index 07ded91..a4cf24a 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 befdd81..3b0eb6d 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"