From c7739bb95e1665e2c77da99c82a6542decdde334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 30 Sep 2024 17:19:09 -0600 Subject: [PATCH] webkitgtk: refactor top-level to deprecate default ABI version --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9d389fa512a..844574c1f3b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23530,21 +23530,23 @@ with pkgs; wcslib = callPackage ../development/libraries/science/astronomy/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { + webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; inherit (darwin) apple_sdk; }; - webkitgtk_4_1 = webkitgtk.override { + webkitgtk_4_1 = webkitgtk_4_0.override { libsoup = libsoup_3; }; - webkitgtk_6_0 = webkitgtk.override { + webkitgtk_6_0 = webkitgtk_4_0.override { libsoup = libsoup_3; gtk3 = gtk4; }; + webkitgtk = webkitgtk_4_0; + webp-pixbuf-loader = callPackage ../development/libraries/webp-pixbuf-loader { }; websocketpp = callPackage ../development/libraries/websocket++ { };