diff options
| author | Tommy Bidne <tbidne@protonmail.com> | 2023-06-07 09:09:48 +1200 |
|---|---|---|
| committer | Tommy Bidne <tbidne@protonmail.com> | 2023-06-07 10:24:38 +1200 |
| commit | 679542641122765010da85ec7cbdb73d40297463 (patch) | |
| tree | 784f1c2f21a513ce979b72ab9177645fa060543d /pkgs | |
| parent | 253a839c4ebbd45d402bbc4318512a5f0d9d5251 (diff) | |
| download | nixlib-679542641122765010da85ec7cbdb73d40297463.tar nixlib-679542641122765010da85ec7cbdb73d40297463.tar.gz nixlib-679542641122765010da85ec7cbdb73d40297463.tar.bz2 nixlib-679542641122765010da85ec7cbdb73d40297463.tar.lz nixlib-679542641122765010da85ec7cbdb73d40297463.tar.xz nixlib-679542641122765010da85ec7cbdb73d40297463.tar.zst nixlib-679542641122765010da85ec7cbdb73d40297463.zip | |
haskell.packages.ghc94.gtk2hs-buildtools: remove patch for upstream fix
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch | 12 |
2 files changed, 0 insertions, 17 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 2d02849c4caa..230e0f324f63 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/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; } diff --git a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch deleted file mode 100644 index 948a0366ca4e..000000000000 --- a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch +++ /dev/null @@ -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 - } - |