cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rustup: 1.17.0 -> 1.18.1

Browse source
This commit is contained in:
xrelkd 2019-04-23 23:37:44 +08:00
parent d16a5a5916
commit dc6190f04a
2 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch
View file

@ -1,32 +1,25 @@
From c21cc756b69a5f33c8a7758b746a816f40f55932 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Sat, 28 Oct 2017 17:58:17 +0200
Subject: [PATCH] nix customization: patchelf installed binaries
---
src/rustup-dist/src/component/package.rs | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/rustup-dist/src/component/package.rs b/src/rustup-dist/src/component/package.rs
index 70c54dcd..f0318986 100644
--- a/src/rustup-dist/src/component/package.rs
+++ b/src/rustup-dist/src/component/package.rs
@@ -100,7 +100,10 @@ impl Package for DirectoryPackage {
let src_path = root.join(&path);
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
index e0fdea28..38d9d0e4 100644
--- a/src/dist/component/package.rs
+++ b/src/dist/component/package.rs
@@ -104,10 +104,11 @@ impl Package for DirectoryPackage {
match &*part.0 {
- "file" => builder.copy_file(path.clone(), &src_path)?,
+ "file" => {
+ builder.copy_file(path.clone(), &src_path)?;
"file" => {
if self.copy {
- builder.copy_file(path.clone(), &src_path)?
+ builder.copy_file(path.clone(), &src_path)?;
} else {
- 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)
+ }
"dir" => builder.copy_dir(path.clone(), &src_path)?,
_ => return Err(ErrorKind::CorruptComponent(name.to_owned()).into()),
}
@@ -118,6 +121,22 @@ impl Package for DirectoryPackage {
}
"dir" => {
if self.copy {
@@ -132,6 +133,22 @@ impl Package for DirectoryPackage {
}
}
+fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) {
+ let is_bin = if let Some(p) = src_path.parent() {
+ p.ends_with("bin")
@ -46,6 +39,3 @@ index 70c54dcd..f0318986 100644
// On Unix we need to set up the file permissions correctly so
// binaries are executable and directories readable. This shouldn't be
// necessary: the source files *should* have the right permissions,
--
2.17.1

21
pkgs/development/tools/rust/rustup/default.nix
View file

@ -3,17 +3,17 @@
, pkgconfig, curl, Security }:
rustPlatform.buildRustPackage rec {
name = "rustup-${version}";
version = "1.17.0";
pname = "rustup";
version = "1.18.1";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rustup.rs";
rev = version;
sha256 = "1mf92z89wqqaj3cg2cqf6basvcz47krldmy8ianfkzp323fimqmn";
sha256 = "0932n708ikxzjv7y78zcrnnnps3rgimsnpaximhm9vmjjnkdgm7x";
};
cargoSha256 = "0y7kbihdrpd35dw24qqqzmccvjdy6arka10p5rnv38d420f1bpzd";
cargoSha256 = "0kw8a9prqjf939g0h8ryyhlm1n84fwdycvl0nkykkwlfqd6hh9hb";
nativeBuildInputs = [ pkgconfig ];
@ -49,9 +49,16 @@ rustPlatform.buildRustPackage rec {
# tries to create .rustup
export HOME=$(mktemp -d)
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
$out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup"
$out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish"
$out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup"
# generate completion scripts for rustup
$out/bin/rustup completions bash rustup > "$out/share/bash-completion/completions/rustup"
$out/bin/rustup completions fish rustup > "$out/share/fish/vendor_completions.d/rustup.fish"
$out/bin/rustup completions zsh rustup > "$out/share/zsh/site-functions/_rustup"
# generate completion scripts for cargo
# Note: fish completion script is not supported.
$out/bin/rustup completions bash cargo > "$out/share/bash-completion/completions/cargo"
$out/bin/rustup completions zsh cargo > "$out/share/zsh/site-functions/_cargo"
'';
meta = with stdenv.lib; {