From a53d1dac020a14e893ca9ed7a1313032ebaac9c1 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 17 Jan 2025 19:41:47 +0000 Subject: [PATCH] haskellPackages.jsaddle-webkit2gtk: bypass compatibility packages for gi-gtk and gi-javascriptcore --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 248a89dc60c5..32c8b9917678 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1661,6 +1661,17 @@ self: super: { # Tests disabled because they assume to run in the whole jsaddle repo and not the hackage tarball of jsaddle-warp. jsaddle-warp = dontCheck super.jsaddle-warp; + # https://github.com/ghcjs/jsaddle/issues/151 + jsaddle-webkit2gtk = overrideCabal (drv: { + postPatch = drv.postPatch or "" + '' + substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-gtk gi-gtk3 + substituteInPlace jsaddle-webkit2gtk.cabal --replace-fail gi-javascriptcore gi-javascriptcore4 + ''; + }) (super.jsaddle-webkit2gtk.override { + gi-gtk = self.gi-gtk3; + gi-javascriptcore = self.gi-javascriptcore4; + }); + # 2020-06-24: Jailbreaking because of restrictive test dep bounds # Upstream issue: https://github.com/kowainik/trial/issues/62 trial = doJailbreak super.trial;