646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
58 lines
2.5 KiB
Diff
58 lines
2.5 KiB
Diff
diff --git a/src/elan-dist/src/component/package.rs b/src/elan-dist/src/component/package.rs
|
|
index c51e76d..ae8159e 100644
|
|
--- a/src/elan-dist/src/component/package.rs
|
|
+++ b/src/elan-dist/src/component/package.rs
|
|
@@ -56,6 +56,52 @@ fn unpack_without_first_dir<R: Read>(archive: &mut tar::Archive<R>, path: &Path)
|
|
entry
|
|
.unpack(&full_path)
|
|
.chain_err(|| ErrorKind::ExtractingPackage)?;
|
|
+ nix_patch_if_needed(&full_path)?;
|
|
+ }
|
|
+
|
|
+ Ok(())
|
|
+}
|
|
+
|
|
+fn nix_patch_if_needed(dest_path: &Path) -> Result<()> {
|
|
+ let is_bin = matches!(dest_path.parent(), Some(p) if p.ends_with("bin"));
|
|
+ if !is_bin { return Ok(()) }
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-interpreter")
|
|
+ .arg("@dynamicLinker@")
|
|
+ .arg(dest_path)
|
|
+ .output();
|
|
+
|
|
+ if dest_path.file_name() == Some(::std::ffi::OsStr::new("leanc")) {
|
|
+ use std::os::unix::fs::PermissionsExt;
|
|
+ let new_path = dest_path.with_extension("orig");
|
|
+ ::std::fs::rename(dest_path, &new_path)?;
|
|
+ ::std::fs::write(dest_path, r#"#! @shell@
|
|
+dir="$(dirname "${BASH_SOURCE[0]}")"
|
|
+# use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
|
|
+LEAN_CC="${LEAN_CC:-@cc@}" exec -a "$0" "$dir/leanc.orig" "$@" -L"$dir/../lib"
|
|
+"#)?;
|
|
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
|
|
+ } else if dest_path.file_name() == Some(::std::ffi::OsStr::new("lake")) {
|
|
+ // since Lean 4.16.0, `lake` calls `LEAN_CC` directly instead of through `leanc`
|
|
+ use std::os::unix::fs::PermissionsExt;
|
|
+ ::std::fs::write(dest_path.with_file_name("cc"), r#"#! @shell@
|
|
+dir="$(dirname "${BASH_SOURCE[0]}")"
|
|
+# use bundled libraries, but not bundled compiler that doesn't know about NIX_LDFLAGS
|
|
+exec "@cc@" "$@" -L"$dir/../lib"
|
|
+"#)?;
|
|
+ ::std::fs::set_permissions(dest_path.with_file_name("cc"), ::std::fs::Permissions::from_mode(0o755))?;
|
|
+
|
|
+ let new_path = dest_path.with_extension("orig");
|
|
+ ::std::fs::rename(dest_path, &new_path)?;
|
|
+ ::std::fs::write(dest_path, r#"#! @shell@
|
|
+dir="$(dirname "${BASH_SOURCE[0]}")"
|
|
+# use custom `cc`
|
|
+LEAN_CC="${LEAN_CC:-"$dir/cc"}" exec -a "$0" "$dir/lake.orig" "$@"
|
|
+"#)?;
|
|
+ ::std::fs::set_permissions(dest_path, ::std::fs::Permissions::from_mode(0o755))?;
|
|
+ } else if dest_path.file_name() == Some(::std::ffi::OsStr::new("llvm-ar")) {
|
|
+ ::std::fs::remove_file(dest_path)?;
|
|
+ ::std::os::unix::fs::symlink("@ar@", dest_path)?;
|
|
}
|
|
|
|
Ok(())
|