diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index f332ae14b9eb..3371bb7fea51 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -18,7 +18,7 @@ gnutls, libgcrypt, libgpg-error, - gtk3, + gtk4, wayland, wayland-protocols, wayland-scanner, @@ -32,7 +32,7 @@ at-spi2-core, cairo, libxml2, - libsoup, + libsoup_3, libsecret, libxslt, harfbuzz, @@ -81,10 +81,10 @@ let abiVersion = - if lib.versionAtLeast gtk3.version "4.0" then + if lib.versionAtLeast gtk4.version "4.0" then "6.0" else - "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"; + "4.${if lib.versions.major libsoup_3.version == "2" then "0" else "1"}"; in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. @@ -209,13 +209,13 @@ clangStdenv.mkDerivation (finalAttrs: { ++ lib.optionals withLibsecret [ libsecret ] - ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [ + ++ lib.optionals (lib.versionAtLeast gtk4.version "4.0") [ wayland-protocols ]; propagatedBuildInputs = [ - gtk3 - libsoup + gtk4 + libsoup_3 ]; cmakeFlags = @@ -225,7 +225,7 @@ clangStdenv.mkDerivation (finalAttrs: { [ "-DENABLE_INTROSPECTION=ON" "-DPORT=GTK" - "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}" + "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup_3.version == "2")}" "-DUSE_LIBSECRET=${cmakeBool withLibsecret}" "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}" ] @@ -244,7 +244,7 @@ clangStdenv.mkDerivation (finalAttrs: { "-DUSE_APPLE_ICU=OFF" "-DUSE_OPENGL_OR_ES=OFF" ] - ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [ + ++ lib.optionals (lib.versionOlder gtk4.version "4.0") [ "-DUSE_GTK4=OFF" ] ++ lib.optionals (!systemdSupport) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 293fe85c5651..5ccbaed6dda0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8810,19 +8810,18 @@ with pkgs; graphviz = graphviz-nox; }; - webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { + webkitgtk_6_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; - libsoup = libsoup_2_4; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; }; - webkitgtk_4_1 = webkitgtk_4_0.override { - libsoup = libsoup_3; + webkitgtk_4_1 = webkitgtk_6_0.override { + gtk4 = gtk3; }; - webkitgtk_6_0 = webkitgtk_4_0.override { - libsoup = libsoup_3; - gtk3 = gtk4; + webkitgtk_4_0 = webkitgtk_6_0.override { + libsoup_3 = libsoup_2_4; + gtk4 = gtk3; }; wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };