diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 40cc38c2e852..80af6d45131d 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 = [ @@ -265,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;