gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.packages.ghc912.glib: patch incompatibility with rts

Browse Source 
Resolves https://github.com/NixOS/nixpkgs/issues/525467.
This commit is contained in:
sterni
2026-06-14 15:17:54 +02:00
parent 3349b2959e
commit 5ad26e362d
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+4
View File
@@ -1547,6 +1547,10 @@ with haskellLib;
revision = null;
}) super.svgcairo;
# Support GHC >= 9.12.3 || >= 9.14.1
# Patch from https://github.com/gtk2hs/gtk2hs/pull/349
glib = appendPatches [ ./patches/glib-support-rts-at-least-9.12.3-and-9.14.patch ] super.glib;
# Too strict upper bound on tasty-hedgehog (<1.5)
# https://github.com/typeclasses/ascii-predicates/pull/1
ascii-predicates = doJailbreak super.ascii-predicates;
pkgs/development/haskell-modules/patches/glib-support-rts-at-least-9.12.3-and-9.14.patch
+24
View File
@@ -0,0 +1,24 @@
From 2e1ddf6f4a28819f42db45859a83f3dd7ed14c0e Mon Sep 17 00:00:00 2001
From: Tuong Nguyen Manh <tuongnm88@gmail.com>
Date: Sat, 14 Feb 2026 11:58:29 +0100
Subject: [PATCH] Fix glib for RTS API change in GHC 9.12.3/9.14.1
---
glib/System/Glib/hsgclosure.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/glib/System/Glib/hsgclosure.c b/glib/System/Glib/hsgclosure.c
index 1610702b..6049827f 100644
--- a/System/Glib/hsgclosure.c
+++ b/System/Glib/hsgclosure.c
@@ -107,7 +107,9 @@ gtk2hs_closure_marshal(GClosure *closure,
WHEN_DEBUG(g_debug("gtk2hs_closure_marshal(%p): about to rts_evalIO", hc->callback));
/* perform the call */
- #if __GLASGOW_HASKELL__>=704
+ #if (__GLASGOW_HASKELL__>=912 && __GLASGOW_HASKELL_PATCHLEVEL1__>=3) || __GLASGOW_HASKELL__>=914
+ rts_evalIO(&cap, rts_apply(CAP (HaskellObj)ghc_hs_iface->runIO_closure, call),&ret);
+ #elif __GLASGOW_HASKELL__>=704
rts_evalIO(&cap, rts_apply(CAP (HaskellObj)runIO_closure, call),&ret);
#else
cap=rts_evalIO(CAP rts_apply(CAP (HaskellObj)runIO_closure, call),&ret);