WIP

angerman · angerman · commit 44af1d427b09 · 2024-01-20T07:16:57.000Z
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -296,6 +296,7 @@ in {
                 ++ final.lib.optional (versionAtLeast "9.0"    && versionLessThan "10.0" && final.stdenv.targetPlatform.is32bit) ./patches/ghc/ghc-9.6-32bit-cmm.patch
                 # this one is to allow linking extra symbols from iserv.
                 ++ final.lib.optional (versionAtLeast "9.6.1"  && versionLessThan"9.10" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/iserv-syms.patch
+                ++ final.lib.optional (versionAtLeast "9.4"                             && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,7 @@ in {`
`296`	`296`	`++ final.lib.optional (versionAtLeast "9.0" && versionLessThan "10.0" && final.stdenv.targetPlatform.is32bit) ./patches/ghc/ghc-9.6-32bit-cmm.patch`
`297`	`297`	`# this one is to allow linking extra symbols from iserv.`
`298`	`298`	`++ final.lib.optional (versionAtLeast "9.6.1" && versionLessThan"9.10" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/iserv-syms.patch`
	`299`	`+ ++ final.lib.optional (versionAtLeast "9.4" && final.stdenv.targetPlatform.isWindows) ./patches/ghc/ghc-9.6-fix-code-symbol-jumps.patch`
`299`	`300`	`;`
`300`	`301`	`in ({`
`301`	`302`	`ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {`