From d5dee06c23230eda72b81efe9e07715859b73ab4 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Nov 2025 12:43:22 +0800 Subject: [PATCH] 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;