CuteEngineering/cutekit
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: NixOS will use clang and not clang-xx

Browse source
This commit is contained in:
Jordan ⌨️ 2024-01-25 15:34:08 +01:00
parent b91e73662a
commit 86768ad452
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cutekit/shell.py
View file

@ -22,6 +22,7 @@ _logger = logging.getLogger(__name__)
@dt.dataclass @dt.dataclass
class Uname: class Uname:
sysname: str sysname: str
distrib: str
nodename: str nodename: str
release: str release: str
version: str version: str
@ -30,7 +31,13 @@ class Uname:
def uname() -> Uname: def uname() -> Uname:
un = platform.uname() un = platform.uname()
result = Uname(un.system, un.node, un.release, un.version, un.machine)
if hasattr(platform, "freedesktop_os_release"):
distrib = platform.freedesktop_os_release()
else:
distrib = {"NAME": "Unknown"}
result = Uname(un.system, distrib['NAME'], un.node, un.release, un.version, un.machine)
match result.machine: match result.machine:
case "aarch64": case "aarch64":
@ -316,6 +323,12 @@ def latest(cmd: str) -> str:
if cmd in LATEST_CACHE: if cmd in LATEST_CACHE:
return LATEST_CACHE[cmd] return LATEST_CACHE[cmd]
if "IN_NIX_SHELL" in os.environ:
# By default, NixOS symlinks tools automatically
# to their latest version. Also, if the user uses
# clang-xx, the std libraries will not be accessible.
return cmd
_logger.debug(f"Finding latest version of {cmd}") _logger.debug(f"Finding latest version of {cmd}")
regex: re.Pattern[str] regex: re.Pattern[str]