haskell.packages.ghc94.gtk2hs-buildtools: gtk2hs setup hook broken for ghc-9.4.4
See https://github.com/gtk2hs/gtk2hs/issues/323 for details.
This commit is contained in:
parent
63862f4a66
commit
962633e4d1
3 changed files with 18 additions and 1 deletions
|
@ -208,4 +208,9 @@ in {
|
|||
# the GHC 9.6 configuration may need similar overrides eventually.
|
||||
X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft;
|
||||
|
||||
# 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;
|
||||
|
||||
}
|
||||
|
|
|
@ -494,7 +494,7 @@ rec {
|
|||
if !lib.isDerivation drv
|
||||
then [ ]
|
||||
else [ { key = drv.outPath; val = drv; } ]
|
||||
) val.buildInputs or [ ];
|
||||
) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]);
|
||||
}
|
||||
);
|
||||
in
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
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
|
||||
}
|
||||
|
Loading…
Reference in a new issue