diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
commit | 6b15fdce86eddd5d23ff448f6a7b50b319c5e686 (patch) | |
tree | 22d541647a440d8fbaabc0ec869a551ce02ff671 /pkgs/development/tools/rust/rustup/default.nix | |
parent | 34a05e29f119bf06fe218b761b3999e4c7a87e65 (diff) | |
parent | 788deaad9dbc27b94c0d930b617f659e71ea7987 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
Diffstat (limited to 'pkgs/development/tools/rust/rustup/default.nix')
-rw-r--r-- | pkgs/development/tools/rust/rustup/default.nix | 41 |
1 files changed, 27 insertions, 14 deletions
diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index edd4dd7afd59d..d18d1a0ec37b3 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -1,6 +1,18 @@ -{ stdenv, lib, runCommand, patchelf -, fetchFromGitHub, rustPlatform, makeWrapper -, pkg-config, curl, zlib, Security, CoreServices }: +{ stdenv +, lib +, runCommand +, patchelf +, fetchFromGitHub +, rustPlatform +, makeWrapper +, pkg-config +, curl +, zlib +, Security +, CoreServices +, libiconv +, xz +}: let libPath = lib.makeLibraryPath [ @@ -10,32 +22,33 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-GKvKawvfm/4eBU4mn/Q9fhu3Ml+j+BsxVNPvbvcnMLU="; + sha256 = "sha256-uRCzVeTr5rr0CvE/1Uz7RHcw4Kt/sOItwcbZJBjjNjg="; }; - cargoSha256 = "sha256-tWww+rR4DQgRacVeLqnOBcuXA7o/NYmJBcJgWX3aLRY="; + cargoSha256 = "sha256-+E6Wa4QrMG/Ow3KehsxIzLzubXJQxCWo/rowC4MPdgk="; nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ - curl zlib - ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + curl + zlib + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ]; cargoBuildFlags = [ "--features no-self-update" ]; patches = lib.optionals stdenv.isLinux [ - (runCommand "0001-dynamically-patchelf-binaries.patch" { CC=stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' - export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) - substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ - --subst-var patchelf \ - --subst-var dynamicLinker \ - --subst-var libPath + (runCommand "0001-dynamically-patchelf-binaries.patch" { CC = stdenv.cc; patchelf = patchelf; libPath = "$ORIGIN/../lib:${libPath}"; } '' + export dynamicLinker=$(cat $CC/nix-support/dynamic-linker) + substitute ${./0001-dynamically-patchelf-binaries.patch} $out \ + --subst-var patchelf \ + --subst-var dynamicLinker \ + --subst-var libPath '') ]; |