nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

teleport: patch os.Executable() call in tsh

Browse Source
This commit is contained in:
Yurii Matsiuk 2021-04-26 14:45:28 +02:00
parent 2b3ac063a4
commit abc4290fa1
No known key found for this signature in database
GPG Key ID: 61302290298601AA
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/servers/teleport/default.nix
View File

@ -27,6 +27,9 @@ buildGoModule rec {
nativeBuildInputs = [ zip makeWrapper ];
# https://github.com/NixOS/nixpkgs/issues/120738
patches = [ ./tsh.patch ];
postBuild = ''
pushd .
mkdir -p build

17
pkgs/servers/teleport/tsh.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go
index 57379c40f..cb4d7b84c 100644
--- a/tool/tsh/tsh.go
+++ b/tool/tsh/tsh.go
@@ -514,10 +514,11 @@ func Run(args []string, opts ...cliOption) error {
}
}
- cf.executablePath, err = os.Executable()
+ tempBinaryPath, err := os.Executable()
if err != nil {
return trace.Wrap(err)
}
+ cf.executablePath = path.Dir(tempBinaryPath) + "/tsh"
if err := client.ValidateAgentKeyOption(cf.AddKeysToAgent); err != nil {
return trace.Wrap(err)