From d25b4a7927a74c728f540bdbff43828b0636d097 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 28 Mar 2026 21:57:17 +0800 Subject: [PATCH] =?UTF-8?q?webkitgtk=5F6=5F0:=202.52.0=20=E2=86=92=202.52.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/WebKit/WebKit/compare/webkitgtk-2.52.0...webkitgtk-2.52.1 https://webkitgtk.org/2026/03/27/webkitgtk2.52.1-released.html https://webkitgtk.org/security/WSA-2026-0002.html Fixes: CVE-2026-20643, CVE-2026-20664, CVE-2026-20665, CVE-2026-20691, CVE-2026-28857, CVE-2026-28859, CVE-2026-28861, CVE-2026-28871 --- pkgs/development/libraries/webkitgtk/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 5f7e98ae0ead..b4939a7364e5 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -84,7 +84,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.52.0"; + version = "2.52.1"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -99,7 +99,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-sxxV8YGUrIO6CMm5O77/71en7P9/Qch00XqeeFPcoZ8="; + hash = "sha256-I459UyBbFABK3X7rQpPJTW+/cJez7+987lUZ5cEhqQQ="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -116,6 +116,14 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) + + # Fix webkitgtk_4_1 build + # WebKitDOMDOMWindow.cpp:1085:10: error: variable has incomplete type 'void' + # https://bugs.webkit.org/show_bug.cgi?id=310915 + (fetchpatch { + url = "https://github.com/WebKit/WebKit/commit/40c315ca7b3ad6ae5c98d72a6927b3a75b43cb46.patch"; + hash = "sha256-xGPi5p2XhDxpd4NtZMrd1JbHvV2fey6V3eH0fgy6ifY="; + }) ]; nativeBuildInputs = [