diff options
author | tomberek <tomberek@users.noreply.github.com> | 2024-06-17 22:36:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-17 22:36:58 -0400 |
commit | 7e22655fd2a9a747d54beec7c8669b3a46a3ec96 (patch) | |
tree | dadaa652c01de6f77972c269627c6bc1e508ecfe /pkgs | |
parent | 31e107dc564e53cf2843bedf6a8b85faa2f845e3 (diff) | |
parent | aff01c1b1d20f15f90b8eb3f40e03bcc438dd3e3 (diff) |
Merge pull request #320371 from techknowlogick/teleport-wasm-broken
teleport: resolve broken for non-wasm builds
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/teleport/generic.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 94ca520964cd7..51bea403f7dbf 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -182,7 +182,10 @@ buildGoModule rec { # 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. - lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; + # 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 + ); }; } |