From 1cc22a05155ee90d0257f11839a34beb08bd730c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 20 Nov 2025 20:39:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?webkitgtk=5F6=5F0:=202.50.1=20=E2=86=92=202?=
 =?UTF-8?q?.50.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/WebKit/WebKit/compare/webkitgtk-2.50.1...webkitgtk-2.50.2
https://webkitgtk.org/security/WSA-2025-0008.html
https://webkitgtk.org/2025/11/19/webkitgtk2.50.2-released.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 40cc38c2e852..ab0ded1e367c 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -86,7 +86,7 @@ in
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.50.1";
+  version = "2.50.2";
   name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
 
   outputs = [
@@ -101,7 +101,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-M+kS7m4820uYA3FfUGhq+Fpgr0fxz3KmrMai2xuz2f4=";
+    hash = "sha256-Gath8tROYs1ENnOUPS1TQbhNCEBfZ6fDe3p3rTVQ+IA=";
   };
 
   patches = lib.optionals clangStdenv.hostPlatform.isLinux [
@@ -118,6 +118,12 @@ clangStdenv.mkDerivation (finalAttrs: {
       hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA=";
       name = "fix_ftbfs_riscv64.patch";
     })
+
+    # Remove the CustomToJSObject flag to avoid a link error due to an undefined toJS() symbol
+    (fetchpatch {
+      url = "https://github.com/WebKit/WebKit/commit/730bffd856d2a1e56dd3bd2a0702282f19c5242a.patch";
+      hash = "sha256-QRgYzr1Flk9BOV74/H7/38sRwc44BFFBhnX+xODgYX4=";
+    })
   ];
 
   nativeBuildInputs = [

From d5dee06c23230eda72b81efe9e07715859b73ab4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 22 Nov 2025 12:43:22 +0800
Subject: [PATCH 2/2] webkitgtk_6_0: Fix passthru.tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* webkit2gtk → webkitgtk
* webkit2gtk-web-extension → webkitgtk-web-process-extension
---
 .../libraries/webkitgtk/default.nix            | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index ab0ded1e367c..80af6d45131d 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -271,11 +271,19 @@ clangStdenv.mkDerivation (finalAttrs: {
     mainProgram = "WebKitWebDriver";
     homepage = "https://webkitgtk.org/";
     license = licenses.bsd2;
-    pkgConfigModules = [
-      "javascriptcoregtk-${abiVersion}"
-      "webkit2gtk-${abiVersion}"
-      "webkit2gtk-web-extension-${abiVersion}"
-    ];
+    pkgConfigModules =
+      if lib.versionAtLeast abiVersion "6.0" then
+        [
+          "javascriptcoregtk-${abiVersion}"
+          "webkitgtk-${abiVersion}"
+          "webkitgtk-web-process-extension-${abiVersion}"
+        ]
+      else
+        [
+          "javascriptcoregtk-${abiVersion}"
+          "webkit2gtk-${abiVersion}"
+          "webkit2gtk-web-extension-${abiVersion}"
+        ];
     platforms = platforms.linux ++ platforms.darwin;
     teams = [ teams.gnome ];
     broken = clangStdenv.hostPlatform.isDarwin;