bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #87187 - oxalica:fix-nixos-detect, r=nagisa

Browse source 
Fix NixOS detection

Use `/etc/os-release` instead of `/etc/NIXOS` for detection.
The latter one does not exist on NixOS when using tmpfs as root.
This commit is contained in:
Guillaume Gomez 2021-07-21 15:52:44 +02:00 • committed by GitHub
commit 2861265f26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/bootstrap.py
View file

@ -580,7 +580,13 @@ class RustBuild(object):
if ostype != "Linux": if ostype != "Linux":
return return
if not os.path.exists("/etc/NIXOS"): # Use `/etc/os-release` instead of `/etc/NIXOS`.
# The latter one does not exist on NixOS when using tmpfs as root.
try:
with open("/etc/os-release", "r") as f:
if not any(line.strip() == "ID=nixos" for line in f):
return
except FileNotFoundError:
return return
if os.path.exists("/lib"): if os.path.exists("/lib"):
return return