fix(third_party/tailscale): Add patch to make taillogin work
This commit is contained in:
parent
77085f5876
commit
78b82c82a2
2 changed files with 30 additions and 0 deletions
28
third_party/tailscale/0001-fix-client-logger.patch
vendored
Normal file
28
third_party/tailscale/0001-fix-client-logger.patch
vendored
Normal file
|
@ -0,0 +1,28 @@
|
||||||
|
From ce33360524307b6da4f996a9f465260e121011f8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Vincent Ambo <tazjin@google.com>
|
||||||
|
Date: Tue, 11 Feb 2020 00:40:37 +0000
|
||||||
|
Subject: [PATCH] fix(control): Ensure control client has a logger function
|
||||||
|
|
||||||
|
For some reason this field ended up being nil in taillogin, which made
|
||||||
|
it difficult to actually log in.
|
||||||
|
---
|
||||||
|
control/controlclient/auto.go | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go
|
||||||
|
index 67f187f..09cdf6f 100644
|
||||||
|
--- a/control/controlclient/auto.go
|
||||||
|
+++ b/control/controlclient/auto.go
|
||||||
|
@@ -160,6 +160,9 @@ func NewNoStart(opts Options) (*Client, error) {
|
||||||
|
//
|
||||||
|
// It should only be called for clients created by NewNoStart.
|
||||||
|
func (c *Client) Start() {
|
||||||
|
+ c.logf = func(f string, args ...interface{}) {
|
||||||
|
+ fmt.Printf(f, args)
|
||||||
|
+ }
|
||||||
|
go c.authRoutine()
|
||||||
|
go c.mapRoutine()
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
2
third_party/tailscale/default.nix
vendored
2
third_party/tailscale/default.nix
vendored
|
@ -16,6 +16,8 @@ in buildGoModule rec {
|
||||||
sha256 = "1islxzr8lhnl2f0r686mcciwb8lzvqjczg9fs0nagr5pp6dsi9fa";
|
sha256 = "1islxzr8lhnl2f0r686mcciwb8lzvqjczg9fs0nagr5pp6dsi9fa";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [ ./0001-fix-client-logger.patch ];
|
||||||
|
|
||||||
goPackagePath = "tailscale.com";
|
goPackagePath = "tailscale.com";
|
||||||
modSha256 = "0cnih9flwgqjq4x4cwyac9yyz1prv2i2by1ki3g71ai8q621bq10";
|
modSha256 = "0cnih9flwgqjq4x4cwyac9yyz1prv2i2by1ki3g71ai8q621bq10";
|
||||||
subPackages = [
|
subPackages = [
|
||||||
|
|
Loading…
Reference in a new issue