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

haskell.packages.ghc94.gtk2hs-buildtools: gtk2hs setup hook broken for ghc-9.4.4

Browse Source 
See https://github.com/gtk2hs/gtk2hs/issues/323 for details.
This commit is contained in:
Peter Simons
2023-02-02 09:41:56 +01:00
committed by Florian Brandes
parent 84311ed990
commit 40c8216481
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,4 +208,9 @@ in {
# the GHC 9.6 configuration may need similar overrides eventually. # the GHC 9.6 configuration may need similar overrides eventually.
X11-xft = __CabalEagerPkgConfigWorkaround super.X11-xft; 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;
} }

2
pkgs/development/haskell-modules/lib/compose.nix
View File

@@ -494,7 +494,7 @@ rec {
if !lib.isDerivation drv if !lib.isDerivation drv
then [ ] then [ ]
else [ { key = drv.outPath; val = drv; } ] else [ { key = drv.outPath; val = drv; } ]
) val.buildInputs or [ ]; ) (val.buildInputs or [ ] ++ val.propagatedBuildInputs or [ ]);
} }
); );
in in

12
pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch Normal file
View File

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