From aff01c1b1d20f15f90b8eb3f40e03bcc438dd3e3 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sun, 16 Jun 2024 18:30:41 -0400 Subject: teleport: resolve broken for non-wasm builds --- pkgs/servers/teleport/generic.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs') 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 + ); }; } -- cgit 1.4.1