Merge pull request #236366 from tbidne/gtk2hs-buildtools-fix

haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix

pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix

@@ -205,11 +205,6 @@ in {
   cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo);
   pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango);
 
-  # The gtk2hs setup hook provided by this package lacks the ppOrdering field that
-  # recent versions of Cabal require. This leads to builds like cairo and glib
-  # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323.
-  gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools;
-
   # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
   gtk = doJailbreak super.gtk;
 }

pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch

@@ -1,12 +0,0 @@
-diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs
-index 598048f..b652b76 100644
---- a/src/Gtk2HsSetup.hs
-+++ b/src/Gtk2HsSetup.hs
-@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
- ourC2hs bi lbi = PreProcessor {
- #endif
-   platformIndependent = False,
-+  ppOrdering = (\ _ _ ms -> return ms),
-   runPreProcessor = runC2HS bi lbi
- }
-