webkitgtk: refactor top-level to deprecate default ABI version (#345611)

NixOS · Oct 12, 2024 · f152a2d · f152a2d
2 parents b375b0b + b9a93b6
commit f152a2d
Show file tree

Hide file tree

Showing 109 changed files with 252 additions and 259 deletions.
diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix
@@ -24,7 +24,7 @@
 , xcbutilkeysyms
 , xcb-util-cursor
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , python3
 , curl
 , pcre
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     libXScrnSaver
     curl
     gtk3
-    webkitgtk
+    webkitgtk_4_0
     freetype
     libGL
     libusb1

diff --git a/pkgs/applications/audio/exaile/default.nix b/pkgs/applications/audio/exaile/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub
 , gobject-introspection, makeWrapper, wrapGAppsHook3
 , gtk3, gst_all_1, python3
-, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk
+, gettext, adwaita-icon-theme, help2man, keybinder3, libnotify, librsvg, streamripper, udisks, webkitgtk_4_0
 , iconTheme ? adwaita-icon-theme
 , deviceDetectionSupport ? true
 , documentationSupport ? true
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional multimediaKeySupport keybinder3
   ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
   ++ lib.optional podcastSupport python3.pkgs.feedparser
-  ++ lib.optional wikipediaSupport webkitgtk;
+  ++ lib.optional wikipediaSupport webkitgtk_4_0;
 
   nativeCheckInputs = with python3.pkgs; [
     pytest

diff --git a/pkgs/applications/audio/plugdata/default.nix b/pkgs/applications/audio/plugdata/default.nix
@@ -8,7 +8,7 @@
 , pkg-config
 , alsa-lib
 , freetype
-, webkitgtk
+, webkitgtk_4_0
 , zenity
 , curl
 , xorg
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     curl
     freetype
-    webkitgtk
+    webkitgtk_4_0
     xorg.libX11
     xorg.libXcursor
     xorg.libXext

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
@@ -21,7 +21,7 @@
   libmodplug,
   librsvg,
   libsoup,
-  webkitgtk,
+  webkitgtk_4_0,
 
   # optional features
   withDbusPython ? false,
@@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication {
       libappindicator-gtk3
       libmodplug
       libsoup
-      webkitgtk
+      webkitgtk_4_0
     ]
     ++ lib.optionals (withXineBackend) [ xine-lib ]
     ++ lib.optionals (withGstreamerBackend) (

diff --git a/pkgs/applications/audio/rymcast/default.nix b/pkgs/applications/audio/rymcast/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
-, alsa-lib, curl, gtk3, webkitgtk, zenity }:
+, alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }:
 
 stdenv.mkDerivation rec {
   pname = "rymcast";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
 
-  buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
+  buildInputs = [ alsa-lib curl gtk3 stdenv.cc.cc.lib webkitgtk_4_0 zenity ];
 
   installPhase = ''
     mkdir -p "$out/bin"

diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix
@@ -16,7 +16,7 @@
 , libopus
 , curl
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     libopus
     curl
     gtk3
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   runtimeDependencies = [

diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix
@@ -12,7 +12,7 @@
 , libXrandr
 , libXrender
 , libjack2
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-    webkitgtk
+    webkitgtk_4_0
   ] ++ runtimeDependencies;
 
   runtimeDependencies = map lib.getLib [

diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, python3
-, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk
+, alsa-lib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk_4_0
 }:
 
 stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkg-config python3 ];
-  buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ];
+  buildInputs = [ alsa-lib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk_4_0 ];
 
   postPatch = ''
     patchShebangs src/tunefish4/generate-lv2-ttl.py

diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix
@@ -12,7 +12,7 @@
 , glib
 , glib-networking
 , libxml2
-, webkitgtk
+, webkitgtk_4_0
 , clutter-gtk
 , clutter-gst
 , libunity
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     libunity
     pantheon.granite
     sqlite
-    webkitgtk
+    webkitgtk_4_0
     glib-networking
   ];
 

diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   pkg-config,
   makeWrapper,
-  webkitgtk,
+  webkitgtk_4_0,
   zenity,
   Cocoa,
   Security,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs =
     lib.optional stdenv.hostPlatform.isDarwin Security
-    ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk
+    ++ lib.optional (withGui && stdenv.hostPlatform.isLinux) webkitgtk_4_0
     ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
       Cocoa
       WebKit

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
-, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk
+, zlib, jdk, glib, glib-networking, gtk, libXtst, libsecret, gsettings-desktop-schemas, webkitgtk_4_0
 , makeWrapper, perl, ... }:
 
 { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description, productVersion }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11
     libXrender libXtst libsecret zlib
-  ] ++ lib.optional (webkitgtk != null) webkitgtk;
+  ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;
 
   buildCommand = ''
     # Unpack tarball.
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
     makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
       --prefix PATH : ${jdk}/bin \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk != null) webkitgtk)} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst libsecret ] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0)} \
       --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse/''${productId}_${productVersion}/configuration"

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXrender, zlib
 , glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas
-, webkitgtk ? null  # for internal web browser
+, webkitgtk_4_0 ? null  # for internal web browser
 , buildEnv, runCommand
 , callPackage
 }:
@@ -29,7 +29,7 @@ in rec {
   # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
   buildEclipseUnversioned = callPackage ./build-eclipse.nix {
     inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
-            jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk
+            jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk_4_0
             makeWrapper;
   };
   buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -55,7 +55,7 @@
 , systemd
 , tree-sitter
 , texinfo
-, webkitgtk
+, webkitgtk_4_0
 , wrapGAppsHook3
 , zlib
 
@@ -274,7 +274,7 @@ mkDerivation (finalAttrs: {
   ] ++ lib.optionals withXinput2 [
     libXi
   ] ++ lib.optionals withXwidgets [
-    webkitgtk
+    webkitgtk_4_0
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     sigtool
   ] ++ lib.optionals withNS [

diff --git a/pkgs/applications/editors/formiko/default.nix b/pkgs/applications/editors/formiko/default.nix
@@ -9,7 +9,7 @@
 , gtkspell3
 , librsvg
 , pygobject3
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 buildPythonApplication rec {
@@ -36,7 +36,7 @@ buildPythonApplication rec {
     gtkspell3
     librsvg
     pygobject3
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   # Needs a display

diff --git a/pkgs/applications/editors/gnome-inform7/default.nix b/pkgs/applications/editors/gnome-inform7/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison
 , texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons
 , inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc
-, webkitgtk, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
+, webkitgtk_4_0, gtksourceview3, gspell, libxml2, goocanvas2, libplist, glib
 , gst_all_1 }:
 
 # Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet.
@@ -92,7 +92,7 @@ in stdenv.mkDerivation {
     gtk3
     gtksourceview3
     gspell
-    webkitgtk
+    webkitgtk_4_0
     libxml2
     goocanvas2
     libplist

diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonApplication, fetchFromGitHub
-, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
+, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk_4_0
 , pygobject3, pyyaml, setuptools
 }:
 
@@ -23,7 +23,7 @@ buildPythonApplication rec {
   build-system = [ setuptools ];
 
   propagatedBuildInputs = [
-    gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
+    gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0
     pygobject3 pyyaml
   ];
 

diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix
@@ -13,7 +13,7 @@
 , openssl
 , pkg-config
 , rustPlatform
-, webkitgtk
+, webkitgtk_4_0
 }:
 
 let
@@ -74,7 +74,7 @@ rustPlatform.buildRustPackage {
   '';
 
   nativeBuildInputs = [ cmake pkg-config ];
-  buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ];
+  buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ];
 
   checkFlags = [
     # tries to mutate the parent directory

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
@@ -31,7 +31,7 @@
 , python3
 , desktop-file-utils
 , itstool
-, withWebservices ? true, webkitgtk
+, withWebservices ? true, webkitgtk_4_0
 }:
 
 stdenv.mkDerivation rec {
@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     libtiff
     libwebp
     libX11
-  ] ++ lib.optional withWebservices webkitgtk;
+  ] ++ lib.optional withWebservices webkitgtk_4_0;
 
   mesonFlags = [
     "-Dlibchamplain=true"

diff --git a/pkgs/applications/graphics/komorebi/default.nix b/pkgs/applications/graphics/komorebi/default.nix
@@ -7,7 +7,7 @@
 , glib
 , gtk3
 , libgee
-, webkitgtk
+, webkitgtk_4_0
 , clutter-gtk
 , clutter-gst
 , ninja
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     libgee
-    webkitgtk
+    webkitgtk_4_0
     clutter-gtk
     clutter-gst
   ];

diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix
@@ -39,7 +39,7 @@
   pcre,
   systemd,
   tbb_2021_11,
-  webkitgtk,
+  webkitgtk_4_0,
   wxGTK31,
   xorg,
   withSystemd ? stdenv.hostPlatform.isLinux,
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
     openvdb_tbb_2021_8
     pcre
     tbb_2021_11
-    webkitgtk
+    webkitgtk_4_0
     wxGTK31'
     xorg.libX11
   ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;

diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix
@@ -4,7 +4,7 @@
 , autoPatchelfHook
 , dpkg
 , openssl
-, webkitgtk
+, webkitgtk_4_0
 , libappindicator
 , wrapGAppsHook3
 , shared-mime-info
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-    webkitgtk
+    webkitgtk_4_0
     libappindicator
 
     glib-networking

diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix
@@ -7,7 +7,7 @@
 , freetype
 , libsoup
 , gtk3
-, webkitgtk
+, webkitgtk_4_0
 , perl
 , cyrus_sasl
 , stdenv
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     freetype
     libsoup
     gtk3
-    webkitgtk
+    webkitgtk_4_0
   ];
 
   meta = with lib; {