Dominik Schwaiger
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
diff --git a/src/main.rs b/src/main.rs
|
|
index d8b46b5..55b8cba 100644
|
|
--- a/src/main.rs
|
|
+++ b/src/main.rs
|
|
@@ -360,7 +360,9 @@ impl<'a> Installer<'a> {
|
|
|
|
// install
|
|
if self.actually_install {
|
|
- rename(&toolchain.dest, toolchain_path)?;
|
|
+ rename(&toolchain.dest, toolchain_path.clone())?;
|
|
+ nix_patchelf(toolchain_path, toolchain.host_target)
|
|
+ .expect("failed to patch toolchain for NixOS");
|
|
eprintln!(
|
|
"toolchain `{}` is successfully installed!",
|
|
toolchain.dest.display()
|
|
@@ -377,6 +379,50 @@ impl<'a> Installer<'a> {
|
|
}
|
|
}
|
|
|
|
+fn nix_patchelf(toolchain_path: PathBuf, host_target: &str) -> Result<(), Error> {
|
|
+ for toolchain_path in [
|
|
+ &toolchain_path.join("bin"),
|
|
+ &toolchain_path.join("lib"),
|
|
+ &toolchain_path
|
|
+ .join("lib")
|
|
+ .join("rustlib")
|
|
+ .join(host_target)
|
|
+ .join("bin"),
|
|
+ &toolchain_path
|
|
+ .join("lib")
|
|
+ .join("rustlib")
|
|
+ .join(host_target)
|
|
+ .join("bin")
|
|
+ .join("gcc-ld"),
|
|
+ &toolchain_path
|
|
+ .join("lib")
|
|
+ .join("rustlib")
|
|
+ .join(host_target)
|
|
+ .join("lib"),
|
|
+ ] {
|
|
+ for entry in toolchain_path.read_dir()? {
|
|
+ let entry = entry?;
|
|
+ eprintln!(
|
|
+ "info: you seem to be running NixOS. Attempting to patch {}",
|
|
+ entry.path().to_str().unwrap()
|
|
+ );
|
|
+
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-interpreter")
|
|
+ .arg("@dynamicLinker@")
|
|
+ .arg(entry.path())
|
|
+ .output();
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-rpath")
|
|
+ .arg("@libPath@")
|
|
+ .arg(entry.path())
|
|
+ .output();
|
|
+ }
|
|
+ }
|
|
+
|
|
+ Ok(())
|
|
+}
|
|
+
|
|
fn fetch_master_commit(client: &Client, github_token: Option<&str>) -> Result<String, Error> {
|
|
eprintln!("fetching HEAD commit hash... ");
|
|
fetch_master_commit_via_git()
|