Add iserv logic

angerman · angerman · commit 26379ae25394 · 2024-01-20T07:16:26.000Z
diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix
@@ -294,6 +294,8 @@ in {
                 ++ final.lib.optional (versionAtLeast "9.0"    && versionLessThan "9.8" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/ghc-9.6-hadrian-android.patch
                 ++ final.lib.optional (versionAtLeast "9.0"    && versionLessThan "9.8" && final.stdenv.targetPlatform.isMusl && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch
                 ++ 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
                 ;
         in ({
             ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {

Original file line number	Diff line number	Diff line change
`@@ -294,6 +294,8 @@ in {`
`294`	`294`	`++ final.lib.optional (versionAtLeast "9.0" && versionLessThan "9.8" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/ghc-9.6-hadrian-android.patch`
`295`	`295`	`++ final.lib.optional (versionAtLeast "9.0" && versionLessThan "9.8" && final.stdenv.targetPlatform.isMusl && final.stdenv.targetPlatform.isAarch64) ./patches/ghc/ghc-9.6-hadrian-strip-cmd.patch`
`296`	`296`	`++ final.lib.optional (versionAtLeast "9.0" && versionLessThan "10.0" && final.stdenv.targetPlatform.is32bit) ./patches/ghc/ghc-9.6-32bit-cmm.patch`
	`297`	`+ # this one is to allow linking extra symbols from iserv.`
	`298`	`+ ++ final.lib.optional (versionAtLeast "9.6.1" && versionLessThan"9.10" && final.stdenv.targetPlatform.isAndroid) ./patches/ghc/iserv-syms.patch`
`297`	`299`	`;`
`298`	`300`	`in ({`
`299`	`301`	`ghc865 = final.callPackage ../compiler/ghc (traceWarnOld "8.6" {`