diff options
| author | figsoda <figsoda@pm.me> | 2023-04-11 13:35:57 -0400 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2023-04-12 09:57:57 +1000 |
| commit | b0b2385325352398b563a0f65f3428e3d64f38b4 (patch) | |
| tree | cae4fc9a11c8327eaf18d7afdd8dad17c419a87c /pkgs/development/compilers/rust | |
| parent | ca908f0b3f6d7c55c15f28d23e78788935aa5488 (diff) | |
| download | nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar.gz nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar.bz2 nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar.lz nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar.xz nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.tar.zst nixlib-b0b2385325352398b563a0f65f3428e3d64f38b4.zip | |
rustc: reapply re-erased-regions-are-local patch
The patch is not in 1.68, and was mistakenly removed
Diffstat (limited to 'pkgs/development/compilers/rust')
| -rw-r--r-- | pkgs/development/compilers/rust/1_68.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/compilers/rust/1_68.nix b/pkgs/development/compilers/rust/1_68.nix index d691a30c51b5..54c9c4a9f1ad 100644 --- a/pkgs/development/compilers/rust/1_68.nix +++ b/pkgs/development/compilers/rust/1_68.nix @@ -17,6 +17,7 @@ , makeRustPlatform , llvmPackages_11 , llvmPackages_15, llvm_15 +, fetchpatch } @ args: import ./default.nix { @@ -57,7 +58,16 @@ import ./default.nix { selectRustPackage = pkgs: pkgs.rust_1_68; - rustcPatches = [ ]; + rustcPatches = [ + # Fixes ICE. + # https://github.com/rust-lang/rust/pull/107688 + (fetchpatch { + name = "re-erased-regions-are-local.patch"; + url = "https://github.com/rust-lang/rust/commit/9d110847ab7f6aef56a8cd20cb6cea4fbcc51cd9.patch"; + excludes = [ "*tests/*" ]; + hash = "sha256-EZH5K1BEOOfi97xZr1xEHFP4jjvJ1+xqtRMvxBoL8pU="; + }) + ]; } -(builtins.removeAttrs args [ "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) +(builtins.removeAttrs args [ "fetchpatch" "pkgsBuildHost" "llvmPackages_11" "llvmPackages_15" "llvm_15"]) |