From 937a7bac8cdc2057b2a8fc77636f217856e1b5b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Sep 2023 00:24:48 +0200 Subject: [PATCH] foliate: Force WebkitGtk 4.1 ABI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 4.1 ABI mainly differs from the 4.0 by using libsoup 3.x. We are phasing out libsoup 2.x so let’s force foliate to use 4.1. --- pkgs/applications/office/foliate/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/foliate/default.nix b/pkgs/applications/office/foliate/default.nix index 294121b32ecd..b8efd18dd4e4 100644 --- a/pkgs/applications/office/foliate/default.nix +++ b/pkgs/applications/office/foliate/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3 -, webkitgtk, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils +, webkitgtk_4_1, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils , gobject-introspection, glib-networking }: stdenv.mkDerivation rec { @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs build-aux/meson/postinstall.py + + substituteInPlace src/main.js \ + --replace "'WebKit2': '4.0'" "'WebKit2': '4.1'" ''; postFixup = '' @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { glib-networking gjs gtk3 - webkitgtk + webkitgtk_4_1 desktop-file-utils gsettings-desktop-schemas ];