mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 14:47:06 +00:00
05b765d299
(Rust now has a dynamic library dependence on zlib. (see https://github.com/rust-lang/rust/pull/72696))
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
|
|
index 3beddf54..0f859b8d 100644
|
|
--- a/src/dist/component/package.rs
|
|
+++ b/src/dist/component/package.rs
|
|
@@ -113,6 +113,7 @@ impl Package for DirectoryPackage {
|
|
} else {
|
|
builder.move_file(path.clone(), &src_path)?
|
|
}
|
|
+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
|
|
}
|
|
"dir" => {
|
|
if self.copy {
|
|
@@ -135,6 +136,29 @@ impl Package for DirectoryPackage {
|
|
}
|
|
}
|
|
|
|
+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
|
|
+ let (is_bin, is_lib) = if let Some(p) = src_path.parent() {
|
|
+ (p.ends_with("bin"), p.ends_with("lib"))
|
|
+ } else {
|
|
+ (false, false)
|
|
+ };
|
|
+
|
|
+ if is_bin {
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-interpreter")
|
|
+ .arg("@dynamicLinker@")
|
|
+ .arg(dest_path)
|
|
+ .output();
|
|
+ }
|
|
+ else if is_lib {
|
|
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
|
|
+ .arg("--set-rpath")
|
|
+ .arg("@libPath@")
|
|
+ .arg(dest_path)
|
|
+ .output();
|
|
+ }
|
|
+}
|
|
+
|
|
#[derive(Debug)]
|
|
pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);
|
|
|