diff options
Diffstat (limited to 'pkgs/servers/teleport/generic.nix')
| -rw-r--r-- | pkgs/servers/teleport/generic.nix | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 51bea403f7dbf..caf345d944b3d 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -27,7 +27,7 @@ , version , hash , vendorHash -, extPatches ? null +, extPatches ? [] , cargoHash ? null , cargoLock ? null , yarnHash @@ -136,6 +136,7 @@ buildGoModule rec { patches = extPatches ++ [ ./0001-fix-add-nix-path-to-exec-env.patch ./rdpclient.patch + ./tsh.patch ]; # Reduce closure size for client machines @@ -180,12 +181,6 @@ buildGoModule rec { platforms = platforms.unix; # go-libfido2 is broken on platforms with less than 64-bit because it defines an array # which occupies more than 31 bits of address space. - broken = stdenv.hostPlatform.parsed.cpu.bits < 64 || - # See comment about wasm32-unknown-unknown in rustc.nix. - # version 15 is the first that starts to use wasm - (lib.versionAtLeast version "15") && ( - lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true - ); + broken = stdenv.hostPlatform.parsed.cpu.bits < 64; }; } |