Skip to content

Commit 8f5c06f

Browse files
committed
Revert "Use different patch"
This reverts commit 988d00a.
1 parent df5c2a4 commit 8f5c06f

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

overlays/bootstrap.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ in {
185185
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.8.1" "9.10" ./patches/ghc/ghc-9.8-hadrian-win-cross.patch)
186186
# support R_X86_64_PC64 (ELF constant 24) - IMAGE_REL_AMD64_SREL32 (PE constant 14), which seems to appear with 9.6 more frequently, and
187187
# results in "unhandled PEi386 relocation type 14".
188-
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1" "9.10" ./patches/ghc/ghc-image-rel-amd64-srel32.patch)
188+
++ final.lib.optionals (final.stdenv.targetPlatform.isWindows) (fromUntil "9.4.1" "9.10" ./patches/ghc/win-reloc-x86_64-pc64.patch)
189189
++ fromUntil "9.4.5" "9.4.6" ./patches/ghc/ghc-9.4.5-include-order-fix.patch
190190
++ fromUntil "9.6.2" "9.8" ./patches/ghc/ghc-9.4.5-include-order-fix.patch
191191
++ fromUntil "9.6.1" "9.10" ./patches/ghc/MR10116.patch

overlays/patches/ghc-image-rel-amd64-srel32.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)