From 349cdce31e42b0388e139758e9542037c9ae7d6e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sun, 16 Apr 2023 16:27:59 +0200 Subject: [PATCH] haskellPackages.jsaddle-webkit2gtk: Apply patch for webkit 2.40 compat --- .../haskell-modules/configuration-common.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ef49ab976244..180fd5f4f40a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1423,12 +1423,21 @@ self: super: { }); }; - jsaddle-webkit2gtk = overrideCabal (old: { - postPatch = old.postPatch or "" + '' - sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal - ''; - }) super.jsaddle-webkit2gtk; + # 2023-04-16: https://github.com/ghcjs/jsaddle/pull/137 + jsaddle-webkit2gtk = lib.pipe super.jsaddle-webkit2gtk + [ + (appendPatch (fetchpatch { + url = "https://github.com/ghcjs/jsaddle/commit/f990366f19d23a8008d482572d52351c1a6f7215.patch"; + hash = "sha256-IbkJrlyG6q5rqMIhn//Dt3u6T314Pug+mQMwwe0LK5w="; + relative = "jsaddle-webkit2gtk"; + })) + (overrideCabal (old: { + postPatch = old.postPatch or "" + '' + sed -i 's/bytestring.*0.11/bytestring/' jsaddle-webkit2gtk.cabal + ''; + })) + ]; # 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19 jsaddle-dom = overrideCabal (old: {