gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustup: also patch binaries in libexec

Browse Source 
fixes https://github.com/NixOS/nixpkgs/issues/186052
This commit is contained in:
Jörg Thalheim
2022-08-11 12:09:57 +02:00
parent 25809585c6
commit 56a690d7fb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
+5 -5
View File
@@ -1,8 +1,8 @@
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
index 3beddf54..0f859b8d 100644
index 73a533b5..408ab815 100644
--- a/src/dist/component/package.rs
+++ b/src/dist/component/package.rs
@@ -113,6 +113,7 @@ impl Package for DirectoryPackage {
@@ -113,6 +113,7 @@ fn install<'a>(
} else {
builder.move_file(path.clone(), &src_path)?
}
@@ -10,13 +10,13 @@ index 3beddf54..0f859b8d 100644
}
"dir" => {
if self.copy {
@@ -135,6 +136,29 @@ impl Package for DirectoryPackage {
@@ -135,6 +136,29 @@ fn components(&self) -> Vec<String> {
}
}
+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"))
+ (p.ends_with("bin") || p.ends_with("libexec"), p.ends_with("lib"))
+ } else {
+ (false, false)
+ };
@@ -38,5 +38,5 @@ index 3beddf54..0f859b8d 100644
+}
+
#[derive(Debug)]
pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);
pub(crate) struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);