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

Always use os-release rather than /lib to detect NixOS

Browse source 
[Two users over on zulip](https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/Bootstrapping.20on.20NixOS) bumped into issues where NixOS wasn't being properly detected.

I believe this was caused by the presence of `/lib` on their machines. `/lib` is not standard on NixOS but can still be created by users or scripts.

We are already checking `/etc/os-release`. The presence of `ID=nixos` in it's output should be trustworthy and we shouldn't then go on to also check for `/lib`.
This commit is contained in:
Ethan Brierley 2023-08-22 09:09:12 +01:00 • committed by Ethan Brierley
parent 32aa40538e
commit 0e070aa548
No known key found for this signature in database
GPG key ID: 65A143F71FF66B09
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/bootstrap.py
View file

@ -644,7 +644,7 @@ class RustBuild(object):
return False
# If the user has asked binaries to be patched for Nix, then
# don't check for NixOS or `/lib`.
# don't check for NixOS.
if self.get_toml("patch-binaries-for-nix", "build") == "true":
return True
@ -652,14 +652,9 @@ class RustBuild(object):
# 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(ln.strip() in ("ID=nixos", "ID='nixos'", 'ID="nixos"') for ln in f):
return False
return any(ln.strip() in ("ID=nixos", "ID='nixos'", 'ID="nixos"') for ln in f)
except FileNotFoundError:
return False
if os.path.exists("/lib"):
return False
return True
answer = self._should_fix_bins_and_dylibs = get_answer()
if answer: