forked from mirrors/nixpkgs
Merge pull request #68684 from zimbatm/rustup-1.19.0
rustup: 1.18.3 -> 1.19.0
This commit is contained in:
commit
51bf5f4b3f
|
@ -1,8 +1,8 @@
|
|||
diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs
|
||||
index e0fdea28..38d9d0e4 100644
|
||||
index 4b432785..fa45e87e 100644
|
||||
--- a/src/dist/component/package.rs
|
||||
+++ b/src/dist/component/package.rs
|
||||
@@ -104,10 +104,11 @@ impl Package for DirectoryPackage {
|
||||
@@ -109,10 +109,11 @@ impl Package for DirectoryPackage {
|
||||
match &*part.0 {
|
||||
"file" => {
|
||||
if self.copy {
|
||||
|
@ -16,10 +16,10 @@ index e0fdea28..38d9d0e4 100644
|
|||
}
|
||||
"dir" => {
|
||||
if self.copy {
|
||||
@@ -132,6 +133,22 @@ impl Package for DirectoryPackage {
|
||||
@@ -135,6 +136,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")
|
||||
|
@ -36,6 +36,6 @@ index e0fdea28..38d9d0e4 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,
|
||||
#[derive(Debug)]
|
||||
pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>);
|
||||
|
||||
|
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rustup";
|
||||
version = "1.18.3";
|
||||
version = "1.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rustup.rs";
|
||||
rev = version;
|
||||
sha256 = "062l893i9czm1lm0x3arj3vfnjg3fg8q8xvq3y4adakmk6yrcc4x";
|
||||
sha256 = "1c0qz9s09ikgy23yssd57v7b5s005y128sldmq0xd9i1fryp129z";
|
||||
};
|
||||
|
||||
cargoSha256 = "1zwlr0zxc97m6xr28ryq5hkrvcns6qg68h7w09sga23xinm3fr11";
|
||||
cargoSha256 = "0rjm01pnb2w39c0jrscmhhsx9gsi3sl9cxd838m77h9pzwsp1h40";
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue