haskellPackages.mkDerivation: propagate pc deps for GHC >= 9.4

This change essentially amounts to inlining
__CabalEagerPkgConfigWorkaround into haskellPackages.mkDerivation and
applying it automatically for the affected GHC versions. This is a bit
overeager, but the best automatic solution we can come up with for now.

Consequently, we don't need __CabalEagerPkgConfigWorkaround in nixpkgs
anymore nor downstream at least for “standard” haskellPackages builds.
__CabalEagerPkgConfigWorkaround is preserved for now since it is still
necessary if using GHC < 9.4 with Cabal >= 3.10 or cabal-install >= 3.10.

The one thing that may or may not be negatively affected by this change
is ghcWithPackages. I doubt this is a problem in practice though, since
it didn't provide pkg-config in the first place. passthru.env and
shellFor do and work correctly since they rely on mkDerivation.

1 files changed, 1 insertions, 30 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 c5670fbdbc99..d2fcb916020c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -243,37 +243,8 @@ self: super: {
     package-version             # doctest <0.21, tasty-hedgehog <1.4
   ;
 
-  # Apply workaround for Cabal 3.9 bug https://github.com/haskell/cabal/issues/8455
-  # by making `pkg-config --static` happy. Note: Cabal 3.8 is also affected, so
-  # the GHC 9.4 configuration needs similar overrides.
-  inherit (pkgs.lib.mapAttrs (_: __CabalEagerPkgConfigWorkaround) super)
-    X11-xft
-    cairo
-    gi-atk
-    gi-cairo
-    gi-cairo-render
-    gi-dbusmenu
-    gi-dbusmenugtk3
-    gi-gdk
-    gi-gdkpixbuf
-    gi-gdkx11
-    gi-gio
-    gi-glib
-    gi-gmodule
-    gi-gobject
-    gi-harfbuzz
-    gi-pango
-    gi-xlib
-    glib
-    gtk-sni-tray
-    haskell-gi
-    haskell-gi-base
-    pango
-    taffybar
-  ;
-
   # Avoid triggering an issue in ghc-9.6.2
-  gi-gtk = disableParallelBuilding (__CabalEagerPkgConfigWorkaround super.gi-gtk);
+  gi-gtk = disableParallelBuilding super.gi-gtk;
 
   # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
   gtk = doJailbreak super.gtk;