emacs30: Mark broken with webkitgtk and switch to webkitgtk_4_1

We are removing `webkitgtk_4_0` let’s switch to 4.1 since emacs supports both.

Though the build system caps it to unmaintained versions:

    > checking for webkit2gtk-4.1 >= 2.12 webkit2gtk-4.1 < 2.41.92... no
    > checking for webkit2gtk-4.0 >= 2.12 webkit2gtk-4.0 < 2.41.92... no
    > configure: error: xwidgets requested but WebKitGTK+ or WebKit framework not found.

Let’s also mark webkitgtk support as broken.

(It is disabled by default since a755ead8efa1716cf72cdbe552835270281d65a6.)

Co-authored-by: Lin Jian <me@linj.tech>
This commit is contained in:
Jan Tojnar
2025-10-18 03:05:02 +02:00
co-authored by Lin Jian
parent 5ea873fa2e
commit 87f93d54c5
@@ -60,7 +60,7 @@
systemdLibs,
tree-sitter,
texinfo,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
zlib,
@@ -141,6 +141,8 @@ let
++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
"${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
];
withWebkitgtk = withXwidgets && stdenv.hostPlatform.isLinux;
in
stdenv.mkDerivation (finalAttrs: {
pname =
@@ -351,8 +353,8 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals withXinput2 [
libXi
]
++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [
webkitgtk_4_0
++ lib.optionals withWebkitgtk [
webkitgtk_4_1
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
sigtool
@@ -504,7 +506,8 @@ stdenv.mkDerivation (finalAttrs: {
};
meta = {
broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
broken =
(withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk;
knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
"CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
];