3
0
Fork 0
forked from mirrors/nixpkgs

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

This commit is contained in:
Tommy Bidne 2023-06-07 09:09:48 +12:00
parent 253a839c4e
commit 6795426411
No known key found for this signature in database
GPG key ID: 42D4DDB937B3211A
2 changed files with 0 additions and 17 deletions

View file

@ -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;
}

View file

@ -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
}