fix: more robust nixos check

alloy-rs · Jan 17, 2025 · 87763f8 · 87763f8
1 parent dd58346
commit 87763f8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/crates/svm-rs/src/install.rs b/crates/svm-rs/src/install.rs
@@ -212,7 +212,7 @@ fn patch_for_nixos(bin: &Path) -> Result<(), SvmError> {
             bin.display()
         ))
         .output()
-        .expect("Failed to execute command");
+        .map_err(|e| SvmError::CouldNotPatchForNixOs(String::new(), e.to_string()))?;
 
     match output.status.success() {
         true => Ok(()),

diff --git a/crates/svm-rs/src/platform.rs b/crates/svm-rs/src/platform.rs
@@ -43,7 +43,10 @@ impl FromStr for Platform {
 }
 
 pub fn is_nixos() -> bool {
-    std::path::Path::new("/etc/NIXOS").exists()
+    cfg!(target_os = "linux")
+        && (std::path::Path::new("/etc/nixos").exists()
+            || std::path::Path::new("/etc/NIXOS").exists())
+        && std::fs::read_to_string("/etc/os-release").is_ok_and(|s| s.contains("NixOS"))
 }
 
 /// Read the current machine's platform.