From 76a030effd500633f45680b731fdf09856247fb2 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Thu, 6 Jul 2023 15:55:31 +0800 Subject: [PATCH] haskell.packages.ghc96.{cairo,glib,pango}: remove jailbreaks Since the gtk2hs issue was fixed and a new version released, the jailbreaks are no longer required. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 83023bf96a86..13cf739f60fb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -192,10 +192,6 @@ self: super: { # by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so # the GHC 9.6 configuration may need similar overrides eventually. X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; - # Jailbreaks for https://github.com/gtk2hs/gtk2hs/issues/323#issuecomment-1416723309 - glib = __CabalEagerPkgConfigWorkaround (doJailbreak super.glib); - cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo); - pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango); # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327 gtk = doJailbreak super.gtk;