bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Allow quotes around nixos in /etc/os-release

Browse source
This commit is contained in:
Joshua Nelson 2022-03-23 23:17:44 +00:00 • committed by Joshua Nelson
parent 93c1a941bb
commit 12b132dd83
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/bootstrap/native.rs
View file

@ -217,12 +217,13 @@ fn fix_bin_or_dylib(builder: &Builder<'_>, fname: &Path) {
if !builder.config.patch_binaries_for_nix { if !builder.config.patch_binaries_for_nix {
// Use `/etc/os-release` instead of `/etc/NIXOS`. // Use `/etc/os-release` instead of `/etc/NIXOS`.
// The latter one does not exist on NixOS when using tmpfs as root. // The latter one does not exist on NixOS when using tmpfs as root.
const NIX_IDS: &[&str] = &["ID=nixos", "ID='nixos'", "ID=\"nixos\""];
let os_release = match File::open("/etc/os-release") { let os_release = match File::open("/etc/os-release") {
Err(e) if e.kind() == ErrorKind::NotFound => return, Err(e) if e.kind() == ErrorKind::NotFound => return,
Err(e) => panic!("failed to access /etc/os-release: {}", e), Err(e) => panic!("failed to access /etc/os-release: {}", e),
Ok(f) => f, Ok(f) => f,
}; };
if !BufReader::new(os_release).lines().any(|l| t!(l).trim() == "ID=nixos") { if !BufReader::new(os_release).lines().any(|l| NIX_IDS.contains(&t!(l).trim())) {
return; return;
} }
if Path::new("/lib").exists() { if Path::new("/lib").exists() {