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

(rustup): (add zlib to rpath in rustup libraries)

Browse Source 
(Rust now has a dynamic library dependence on zlib. (see https://github.com/rust-lang/rust/pull/72696))
This commit is contained in:
Jade Harley 2020-06-22 19:18:42 -05:00
parent 48faedc336
commit 05b765d299
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
View File

@ -1,30 +1,24 @@
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
index 4b432785..fa45e87e 100644 index 3beddf54..0f859b8d 100644
--- a/src/dist/component/package.rs --- a/src/dist/component/package.rs
+++ b/src/dist/component/package.rs +++ b/src/dist/component/package.rs
@@ -109,10 +109,11 @@ impl Package for DirectoryPackage { @@ -113,6 +113,7 @@ impl Package for DirectoryPackage {
match &*part.0 {
"file" => {
if self.copy {
- builder.copy_file(path.clone(), &src_path)?
+ builder.copy_file(path.clone(), &src_path)?;
} else { } else {
- builder.move_file(path.clone(), &src_path)? builder.move_file(path.clone(), &src_path)?
+ builder.move_file(path.clone(), &src_path)?;
} }
+ nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path) + nix_patchelf_if_needed(&target.prefix().path().join(path.clone()), &src_path)
} }
"dir" => { "dir" => {
if self.copy { if self.copy {
@@ -135,6 +136,22 @@ impl Package for DirectoryPackage { @@ -135,6 +136,29 @@ impl Package for DirectoryPackage {
} }
} }
+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
+ let is_bin = if let Some(p) = src_path.parent() { + let (is_bin, is_lib) = if let Some(p) = src_path.parent() {
+ p.ends_with("bin") + (p.ends_with("bin"), p.ends_with("lib"))
+ } else { + } else {
+ false + (false, false)
+ }; + };
+ +
+ if is_bin { + if is_bin {
@ -34,6 +28,13 @@ index 4b432785..fa45e87e 100644
+ .arg(dest_path) + .arg(dest_path)
+ .output(); + .output();
+ } + }
+ else if is_lib {
+ let _ = ::std::process::Command::new("@patchelf@/bin/patchelf")
+ .arg("--set-rpath")
+ .arg("@libPath@")
+ .arg(dest_path)
+ .output();
+ }
+} +}
+ +
#[derive(Debug)] #[derive(Debug)]

15
pkgs/development/tools/rust/rustup/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, runCommand, patchelf { stdenv, lib, runCommand, patchelf
, fetchFromGitHub, rustPlatform , fetchFromGitHub, rustPlatform
, pkgconfig, curl, Security, CoreServices }: , pkgconfig, curl, zlib, Security, CoreServices }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "rustup"; pname = "rustup";
@ -18,18 +18,25 @@ rustPlatform.buildRustPackage rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
curl curl zlib
] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
cargoBuildFlags = [ "--features no-self-update" ]; cargoBuildFlags = [ "--features no-self-update" ];
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
(runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; } '' (let
libPath = lib.makeLibraryPath [
zlib # libz.so.1
];
in
(runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } ''
export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) export dynamicLinker=$(cat $CC/nix-support/dynamic-linker)
substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ substitute ${./0001-dynamically-patchelf-binaries.patch} $out \
--subst-var patchelf \ --subst-var patchelf \
--subst-var dynamicLinker --subst-var dynamicLinker \
--subst-var libPath
'') '')
)
]; ];
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;