From f3d698558ee9eb9b9a62dcd981abf34ae36032f3 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 24 Jun 2023 07:20:11 -0600 Subject: [PATCH] overlays/tailscale: switch back to plain override, the module overide isn't working.. --- overlays/tailscale.nix | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/overlays/tailscale.nix b/overlays/tailscale.nix index 5d3c449..0f74ed3 100644 --- a/overlays/tailscale.nix +++ b/overlays/tailscale.nix @@ -12,23 +12,21 @@ let "-X tailscale.com/version.shortStamp=${version}" ]; - #tailscale = _: super: { - # tailscale = super.tailscale.overrideAttrs (_: { - # version = "1.44.0"; - # src = super.fetchFromGitHub fetchArgs - # inherit vendorHash ldflags version; - # ]; - # }); - #}; - tailscale = _: super: { - tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" { - buildGoModule = args: - super.buildGo120Module (args // { - src = super.fetchFromGitHub fetchArgs; - inherit vendorHash ldflags version; - }); - }; + tailscale = super.tailscale.overrideAttrs (_: { + src = super.fetchFromGitHub fetchArgs; + inherit vendorHash ldflags version; + }); }; + #tailscale = _: super: { + # tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" { + # buildGoModule = args: + # super.buildGo120Module (args // { + # src = super.fetchFromGitHub fetchArgs; + # inherit vendorHash ldflags version; + # }); + # }; + #}; + in tailscale