diff --git a/pkgs/applications/audio/bespokesynth/default.nix b/pkgs/applications/audio/bespokesynth/default.nix index 83c5af0a53fc..01b98999ce25 100644 --- 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 index 9d5c69858aef..5387069072f5 100644 --- 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 index e58e5aabcd81..6998cb00eaeb 100644 --- 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 index a47b01b8cf58..7a0063238d49 100644 --- 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 index 06e711941a63..4fecaf373726 100644 --- 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 index d8a69ecd9a0b..bbf52c11b990 100644 --- 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 index e5adc356b697..af5dd750c50a 100644 --- 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 index df7564abcf02..8c2855d73282 100644 --- 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 index ee97a92ac328..7633ab22e26a 100644 --- 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 index 7e9981cc39ec..50a100254e99 100644 --- 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 index 46642d6755f7..dfb2fd38b997 100644 --- 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 index 9c1963554c3f..2e1501d635cd 100644 --- 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 index 8c5380597834..e7fe2ccac658 100644 --- 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 index 40c7fba0be82..1fa92679f651 100644 --- 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 index df1baa997a21..e4cc85057928 100644 --- 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 index 679cde8b5037..e977ae20687a 100644 --- 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 index 9c3a04e8dde3..6af5e5da6cf1 100644 --- 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 index 5b56ce758561..f2666b3ee107 100644 --- 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 index f98549cb14ff..91e4ad570ef8 100644 --- 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 index b1ff6eb0a2f5..4084734aa58e 100644 --- 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 index b438f6c6d5df..85109890fb8e 100644 --- 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 index 2fb8b15e3e94..423a77302684 100644 --- 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; { diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 2583663fb6f8..f01be485ae05 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -13,7 +13,7 @@ , gtk3 , libnotify , pango -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 # check inputs @@ -93,7 +93,7 @@ buildPythonApplication rec { gtk3 libnotify pango - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 0f2f1e9c0860..683b45ccbf21 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -7,7 +7,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ zenity gtksourceview gnome-desktop libgnome-keyring webkitgtk_4_0 ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index d98ecb21daaf..a20ed2d48b84 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -9,7 +9,7 @@ , steam-run , substituteAll , unzip -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ python3Packages.pygobject3 python3Packages.requests - webkitgtk + webkitgtk_4_0 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index cae71f785978..f7fa1223a34c 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 -, qrencode, webkitgtk, discount, json-glib, fetchpatch }: +, qrencode, webkitgtk_4_0, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { pname = "pdfpc"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { (gst-plugins-good.override { gtkSupport = true; }) gst-libav qrencode - webkitgtk + webkitgtk_4_0 discount json-glib ]; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index d2340b15f1b7..5f226752ccd3 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -11,7 +11,7 @@ , perl , sqlite , tzdata -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xvfb-run }: @@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec { buildInputs = [ sqlite gtk3 - webkitgtk + webkitgtk_4_0 glib-networking adwaita-icon-theme gdk-pixbuf diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index c510e8853708..903839049d0d 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , python3Packages }: @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { # webkitgtk is used for rendering interactive statistics graph which # can be seen by opening a ROM, entering Pokemon section, selecting # any Pokemon, and clicking Stats and Moves tab. - webkitgtk + webkitgtk_4_0 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index cf3a6a46f9de..bcad8be29b58 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -8,7 +8,7 @@ , gobject-introspection , gtk3 , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libnotify , keybinder3 , libappindicator @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { libappindicator libnotify librsvg - webkitgtk + webkitgtk_4_0 wmctrl ]; diff --git a/pkgs/applications/networking/apache-directory-studio/default.nix b/pkgs/applications/networking/apache-directory-studio/default.nix index 596ba95b7450..7a051db5363e 100644 --- a/pkgs/applications/networking/apache-directory-studio/default.nix +++ b/pkgs/applications/networking/apache-directory-studio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk }: +{ lib, stdenv, fetchurl, jdk, makeWrapper, autoPatchelfHook, makeDesktopItem, glib, libsecret, webkitgtk_4_0 }: stdenv.mkDerivation rec { pname = "apache-directory-studio"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { makeWrapper "$dest/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \ --prefix PATH : "${jdk}/bin" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} install -D icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm" install -D -t "$out/share/applications" ${desktopItem}/share/applications/* ''; diff --git a/pkgs/applications/networking/browsers/badwolf/default.nix b/pkgs/applications/networking/browsers/badwolf/default.nix index dabbdf898192..1c56fedfbdf0 100644 --- a/pkgs/applications/networking/browsers/badwolf/default.nix +++ b/pkgs/applications/networking/browsers/badwolf/default.nix @@ -5,7 +5,7 @@ , pkg-config , ed , wrapGAppsHook3 -, webkitgtk +, webkitgtk_4_0 , libxml2 , glib-networking , gettext @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 libxml2 gettext glib-networking diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 1c82fa7d8612..6b68cbb4a027 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,5 +1,5 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script -, python3, gtk3, libsecret, gst_all_1, webkitgtk, glib +, python3, gtk3, libsecret, gst_all_1, webkitgtk_4_0, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { gtkspell3 hunspell libsecret - webkitgtk + webkitgtk_4_0 glib ]; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 0cd58bbd25a2..5036f0c6265e 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -13,7 +13,7 @@ , pantheon , pkg-config , python3 -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { libdazzle libgee pantheon.granite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 6011755e3892..95b6958cd51c 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -10,7 +10,7 @@ , luafilesystem , luajit , sqlite -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { luafilesystem luajit sqlite - webkitgtk + webkitgtk_4_0 ] ++ ( with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index f937f690b582..3a2a67035328 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -9,7 +9,7 @@ , gcr , libpeas , gtk3 -, webkitgtk +, webkitgtk_4_0 , sqlite , gsettings-desktop-schemas , libsoup @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 libpeas sqlite - webkitgtk + webkitgtk_4_0 json-glib libarchive ]; diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index 16231815c426..b8d17500db27 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -15,7 +15,7 @@ , gdk-pixbuf , cairo , pango -, webkitgtk +, webkitgtk_4_0 , openssl , gstreamer , gst-libav @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { cairo pango gtk3 - webkitgtk + webkitgtk_4_0 openssl libfixposix ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index ec31a8d1a39c..990036a8045e 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchgit , pkg-config, wrapGAppsHook3 -, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk +, glib, gcr, glib-networking, gsettings-desktop-schemas, gtk, libsoup, webkitgtk_4_0 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1 , patches ? null }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas gtk libsoup - webkitgtk + webkitgtk_4_0 ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://surf.suckless.org"; license = licenses.mit; - platforms = webkitgtk.meta.platforms; + platforms = webkitgtk_4_0.meta.platforms; maintainers = with maintainers; [ joachifm ]; }; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index e76b79f9d09f..e02e07419ea1 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk, gtk3, glib-networking +{ lib, stdenv, fetchFromGitHub, pkg-config, libsoup, webkitgtk_4_0, gtk3, glib-networking , gsettings-desktop-schemas, wrapGAppsHook3 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; - buildInputs = [ gtk3 libsoup webkitgtk glib-networking gsettings-desktop-schemas ]; + buildInputs = [ gtk3 libsoup webkitgtk_4_0 glib-networking gsettings-desktop-schemas ]; passthru = { inherit gtk3; diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index f751c1332917..6f75e836ab0e 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -18,7 +18,7 @@ libxml2, openssl, sqlite, - webkitgtk, + webkitgtk_6_0, glib-networking, librsvg, gst_all_1, @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { libxml2 openssl sqlite - webkitgtk + webkitgtk_6_0 # TLS support for loading external content in webkitgtk WebView glib-networking diff --git a/pkgs/applications/networking/geph/default.nix b/pkgs/applications/networking/geph/default.nix index 43761b659b82..1a8fa7d547ab 100644 --- a/pkgs/applications/networking/geph/default.nix +++ b/pkgs/applications/networking/geph/default.nix @@ -11,7 +11,7 @@ perl, pkg-config, glib, - webkitgtk, + webkitgtk_4_0, libayatana-appindicator, cairo, openssl, @@ -88,7 +88,7 @@ in buildInputs = [ glib - webkitgtk + webkitgtk_4_0 libayatana-appindicator cairo openssl diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 872c869f1691..110d5c04767a 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -8,7 +8,7 @@ , wrapGAppsHook4 , gtk4 , gdk-pixbuf -, webkitgtk +, webkitgtk_4_0 , gtksourceview5 , glib-networking , libadwaita @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk4 gdk-pixbuf - webkitgtk + webkitgtk_4_0 gtksourceview5 glib-networking libadwaita diff --git a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix index 0d4a6299adfc..a31adac9568f 100644 --- a/pkgs/applications/networking/instant-messengers/trillian-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/trillian-im/default.nix @@ -16,7 +16,7 @@ , librsvg , libzip , openssl -, webkitgtk +, webkitgtk_4_0 , libappindicator-gtk3 }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { librsvg libzip openssl - webkitgtk + webkitgtk_4_0 libappindicator-gtk3 ]; diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 0925bae8a695..47b1ccfd49e1 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -20,7 +20,7 @@ , pcre , pcre2 , pkg-config -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , xorg }: @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pcre pcre2 sqlite - webkitgtk + webkitgtk_4_0 xorg.libXdmcp xorg.libXtst ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index a1e6177f7278..559c17bd7467 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, adwaita-icon-theme, gmime3, webkitgtk_4_0, ronn , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtkmm3 gmime3 webkitgtk libsass libpeas + gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas python3 notmuch boost gsettings-desktop-schemas adwaita-icon-theme glib-networking protobuf diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index e6453e377d93..acec1b5cf0fa 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -18,7 +18,7 @@ , openssl , pkg-config , sqlite -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { libsecret openssl sqlite - webkitgtk + webkitgtk_4_0 ]; configureFlags = [ diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index d0345f946600..523d6971dfdb 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -31,7 +31,7 @@ , enablePluginBsfilter ? true , enablePluginClamd ? true , enablePluginDillo ? true -, enablePluginFancy ? true, webkitgtk +, enablePluginFancy ? true, webkitgtk_4_0 , enablePluginFetchInfo ? true , enablePluginKeywordWarner ? true , enablePluginLibravatar ? enablePluginRavatar @@ -67,7 +67,7 @@ let { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } - { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk ]; } + { flags = [ "fancy-plugin" ]; enabled = enablePluginFancy; deps = [ webkitgtk_4_0 ]; } { flags = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 9713389954a7..e117549d5756 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -8,8 +8,8 @@ , libxml2 , libxslt , sqlite -, libsoup -, webkitgtk +, libsoup_3 +, webkitgtk_4_1 , json-glib , gst_all_1 , libnotify @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - webkitgtk + webkitgtk_4_1 libxml2 libxslt sqlite - libsoup + libsoup_3 libpeas gsettings-desktop-schemas json-glib diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index b59a82f720dc..dd4a8113cc29 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more -, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk, gtk2-x11, gtk3 +, file, atk, alsa-lib, cairo, fontconfig, gdk-pixbuf, glib, webkitgtk_4_0, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { gdk-pixbuf gnome2.gtkglext glib-networking - webkitgtk + webkitgtk_4_0 gtk2 gtk2-x11 gtk3 diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 92ccc8f46ed2..e62d4edfe97f 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -16,7 +16,7 @@ , json-glib , libappindicator , libsoup -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { json-glib libappindicator libsoup - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index f35a0e515897..48ad4ce47244 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -23,7 +23,7 @@ , unar , unzip , vala -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { poppler python3 sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 4bc6060cfa6b..4541f77dc3d5 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -17,7 +17,7 @@ , libgee , pantheon , sqlite -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation rec { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libgee pantheon.granite sqlite - webkitgtk + webkitgtk_4_0 ]; postPatch = '' diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index c49d9bc2c425..de1086f1f53d 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify -, libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook3 }: +, libarchive, gspell, webkitgtk_4_0, libgringotts, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "osmo"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive - gspell webkitgtk libgringotts ]; + gspell webkitgtk_4_0 libgringotts ]; meta = with lib; { description = "Handy personal organizer"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index b544d5fc6b14..cd96b1d669a1 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -11,7 +11,7 @@ , gtksourceview , libgee , nix-update-script -, webkitgtk +, webkitgtk_4_0 , libqalculate , intltool , gnuplot @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { gtksourceview libgee pantheon.granite - webkitgtk + webkitgtk_4_0 # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix index 41b33b528a9f..51fcb7468b03 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , obs-studio -, webkitgtk +, webkitgtk_4_0 , glib-networking , meson , cmake @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ obs-studio - webkitgtk + webkitgtk_4_0 glib-networking ]; diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix index 33dde993cd8f..cf2f5ebc7167 100644 --- a/pkgs/by-name/am/am2rlauncher/package.nix +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -4,7 +4,7 @@ , glibc , gtk3 , libappindicator -, webkitgtk +, webkitgtk_4_0 , e2fsprogs , libnotify , libgit2 @@ -63,7 +63,7 @@ buildDotnetModule { glibc gtk3 libappindicator - webkitgtk + webkitgtk_4_0 e2fsprogs libnotify libgit2 diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 0e5b60fd4a85..29be06265208 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -20,7 +20,7 @@ poppler, stdenv, testers, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence # otherwise warnings in compilation pcre poppler - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix index bffc25ca4829..fad93e74d47f 100644 --- a/pkgs/by-name/aw/aws-workspaces/package.nix +++ b/pkgs/by-name/aw/aws-workspaces/package.nix @@ -11,7 +11,7 @@ , gtk3 , openssl_1_1 , icu70 -, webkitgtk +, webkitgtk_4_0 , librsvg , gdk-pixbuf , libsoup @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { gtk3 openssl_1_1.out icu70 - webkitgtk + webkitgtk_4_0 librsvg gdk-pixbuf libsoup diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 867dff3b7c4f..1746042b4287 100644 --- a/pkgs/by-name/ca/cargo-tauri/package.nix +++ b/pkgs/by-name/ca/cargo-tauri/package.nix @@ -9,7 +9,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix index d9304e38910d..1cfa3eee9c38 100644 --- a/pkgs/by-name/ca/cargo-tauri/test-app.nix +++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix @@ -8,7 +8,7 @@ libsoup, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, }: @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index d4dbc5b39094..101ba9bb74ce 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -11,7 +11,7 @@ libsoup, fetchzip, openssl_3, - webkitgtk, + webkitgtk_4_0, gdk-pixbuf, pkg-config, makeDesktopItem, @@ -39,7 +39,7 @@ stdenv.mkDerivation { buildInputs = [ curl wget - webkitgtk + webkitgtk_4_0 gtk3 cairo gdk-pixbuf diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 25eae2931c03..435b8e0c9b0b 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -32,7 +32,7 @@ , sqlite , stdenv , util-linuxMinimal -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { python3 sqlite util-linuxMinimal - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index e080ee6c05b8..9e9e3ae6b341 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -32,7 +32,7 @@ , python3 , sqlite , gcc11Stdenv -, webkitgtk +, webkitgtk_4_0 }: let # JUCE version in submodules is incompatible with GCC12 @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { pcre2 python3 sqlite - webkitgtk + webkitgtk_4_0 ]; # Link-time-optimization fails without these diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index e333f1cda423..0db5ab04ae63 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -14,7 +14,7 @@ glib, glib-networking, libayatana-appindicator, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 21baad40d3f7..3c8575f5b1e1 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -5,7 +5,7 @@ pkg-config, openssl, pname, - webkitgtk, + webkitgtk_4_0, service-cargo-hash, meta, }: @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; env = { diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 64386c552dce..966efa763d19 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -9,7 +9,7 @@ rustPlatform, makeDesktopItem, meta, - webkitgtk, + webkitgtk_4_0, openssl, }: rustPlatform.buildRustPackage { @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index 9b5bf26200fb..d8f5a5362c36 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -11,7 +11,7 @@ gtk3, swt, glib, - webkitgtk, + webkitgtk_4_0, glib-networking, }: @@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { swt gtk3 glib - webkitgtk + webkitgtk_4_0 glib-networking ] }" diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix index 4f81bfa4943f..0eb643a44b04 100644 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ b/pkgs/by-name/de/desktop-postflop/package.nix @@ -7,7 +7,7 @@ , pkg-config , gtk3 , libsoup -, webkitgtk +, webkitgtk_4_0 }: rustPlatform.buildRustPackage rec { @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; postInstall = '' diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index a60a03c39367..859d509b25b6 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -7,7 +7,7 @@ , gst_all_1 , libappindicator , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix index 81489925d19f..71b2de66590c 100644 --- a/pkgs/by-name/en/en-croissant/package.nix +++ b/pkgs/by-name/en/en-croissant/package.nix @@ -14,7 +14,7 @@ openssl, libsoup, - webkitgtk, + webkitgtk_4_0, gst_all_1, darwin, }: @@ -66,7 +66,7 @@ buildRustPackage rec { lib.optionals stdenv.hostPlatform.isLinux [ openssl libsoup - webkitgtk + webkitgtk_4_0 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-bad diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix index e39d90866813..268ffdf2b507 100644 --- a/pkgs/by-name/en/ente-auth/package.nix +++ b/pkgs/by-name/en/ente-auth/package.nix @@ -2,7 +2,7 @@ lib, flutter324, fetchFromGitHub, - webkitgtk, + webkitgtk_4_0, sqlite, libayatana-appindicator, makeDesktopItem, @@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 sqlite libayatana-appindicator ]; diff --git a/pkgs/by-name/fo/font-manager/package.nix b/pkgs/by-name/fo/font-manager/package.nix index aff880f06d2d..dc9b27fdd3af 100644 --- a/pkgs/by-name/fo/font-manager/package.nix +++ b/pkgs/by-name/fo/font-manager/package.nix @@ -20,7 +20,7 @@ , wrapGAppsHook4 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts -, withWebkit ? true, glib-networking, libsoup, webkitgtk +, withWebkit ? true, glib-networking, libsoup_3, webkitgtk_6_0 }: stdenv.mkDerivation rec { @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { adwaita-icon-theme ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load - libsoup - webkitgtk + libsoup_3 + webkitgtk_6_0 ]; mesonFlags = [ diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index 68679cfcfea4..af81f5021fca 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -19,7 +19,7 @@ moreutils, openssl, rust, - webkitgtk, + webkitgtk_4_0, nix-update-script, cacert, }: @@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 0f4c8dbfc5dc..888f5285938e 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -19,7 +19,7 @@ libuuid, curl, libhandy, - webkitgtk, + webkitgtk_4_0, gnome, adwaita-icon-theme, libxml2, @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { libuuid curl libhandy - webkitgtk + webkitgtk_4_0 tracker gnome-online-accounts gsettings-desktop-schemas diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 9f7ca7364604..c7d7e6c51380 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -22,7 +22,7 @@ , perlPackages , pkg-config , swig -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { libxml2 libxslt swig - webkitgtk + webkitgtk_4_0 ] ++ (with perlPackages; [ JSONParse diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index e1199c9ed372..c54be41b2f06 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -6,7 +6,7 @@ openssl, pkg-config, perl, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage rec { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libsoup openssl - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index 2b71ad126eff..2eb5257fee25 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -3,7 +3,7 @@ , dpkg , fetchurl , autoPatchelfHook -, webkitgtk +, webkitgtk_4_0 }: stdenv.mkDerivation (finalAttrs: { @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - webkitgtk + webkitgtk_4_0 ]; installPhase = '' diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 8fa8aa976e34..f9ff4b6119ca 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -7,7 +7,7 @@ , curlMinimal , openssl , libsecret -, webkitgtk +, webkitgtk_4_0 , libsoup , gtk3 , atk @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { curlMinimal openssl libsecret - webkitgtk + webkitgtk_4_0 libsoup gtk3 atk diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index b700b198bc37..74639a6fbb50 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -8,7 +8,7 @@ , desktop-file-utils , openssl , libayatana-appindicator -, webkitgtk +, webkitgtk_4_0 , pkg-config , pnpm , nodejs @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl libayatana-appindicator - webkitgtk + webkitgtk_4_0 ]; postInstall = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/by-name/lr/lrcget/package.nix b/pkgs/by-name/lr/lrcget/package.nix index 0d77c2d09f22..8ec4bfc21e21 100644 --- a/pkgs/by-name/lr/lrcget/package.nix +++ b/pkgs/by-name/lr/lrcget/package.nix @@ -2,7 +2,7 @@ dbus, openssl, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, fetchFromGitHub, @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { gtk3 ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - webkitgtk + webkitgtk_4_0 alsa-lib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/mi/mihomo-party/package.nix b/pkgs/by-name/mi/mihomo-party/package.nix index 66584bcbfa69..80df07cd6cb1 100644 --- a/pkgs/by-name/mi/mihomo-party/package.nix +++ b/pkgs/by-name/mi/mihomo-party/package.nix @@ -9,7 +9,7 @@ nspr, alsa-lib, openssl, - webkitgtk, + webkitgtk_4_0, udev, libayatana-appindicator, libGL, @@ -36,7 +36,7 @@ stdenv.mkDerivation { nspr alsa-lib openssl - webkitgtk + webkitgtk_4_0 stdenv.cc.cc.lib ]; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index c53296c3b027..3d43797b9b1b 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -19,7 +19,7 @@ nodejs, openssl, pkg-config, - webkitgtk, + webkitgtk_4_0, }: rustPlatform.buildRustPackage { pname = "modrinth-app-unwrapped"; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { [ openssl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ libsoup - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 01478b8015b1..5fcb4126cf87 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -18,7 +18,7 @@ libevdev, gtk3, libsoup, - webkitgtk, + webkitgtk_4_0, }: stdenv.mkDerivation (finalAttrs: { @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # Tauri deps gtk3 libsoup - webkitgtk + webkitgtk_4_0 ]; npmDeps = fetchNpmDeps { diff --git a/pkgs/by-name/oi/oidc-agent/package.nix b/pkgs/by-name/oi/oidc-agent/package.nix index bfcc2accc9ad..60d0c2b972a7 100644 --- a/pkgs/by-name/oi/oidc-agent/package.nix +++ b/pkgs/by-name/oi/oidc-agent/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, curl, - webkitgtk, + webkitgtk_4_0, libmicrohttpd, libsecret, qrencode, @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl - webkitgtk + webkitgtk_4_0 libmicrohttpd libsecret qrencode diff --git a/pkgs/by-name/ov/overlayed/package.nix b/pkgs/by-name/ov/overlayed/package.nix index 19452d768d5b..215b205d78ea 100644 --- a/pkgs/by-name/ov/overlayed/package.nix +++ b/pkgs/by-name/ov/overlayed/package.nix @@ -5,7 +5,7 @@ pkg-config, openssl, libsoup, - webkitgtk, + webkitgtk_4_0, fetchFromGitHub, libayatana-appindicator, }: @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl - webkitgtk + webkitgtk_4_0 libsoup ]; diff --git a/pkgs/by-name/po/portfolio/package.nix b/pkgs/by-name/po/portfolio/package.nix index 468d56e8d418..c73b6985f341 100644 --- a/pkgs/by-name/po/portfolio/package.nix +++ b/pkgs/by-name/po/portfolio/package.nix @@ -10,7 +10,7 @@ openjdk17, stdenvNoCC, swt, - webkitgtk, + webkitgtk_4_0, wrapGAppsHook3, gitUpdater, }: @@ -30,7 +30,7 @@ let gtk3 libsecret swt - webkitgtk + webkitgtk_4_0 ]; in stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index 72f6dd5e2889..bd1c7c497472 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -14,7 +14,7 @@ buildGoModule, libayatana-appindicator, gtk3, - webkitgtk, + webkitgtk_4_0, libsoup, openssl, xdotool, @@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup libayatana-appindicator openssl - webkitgtk + webkitgtk_4_0 xdotool ]; diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index 8434f8672305..5e5e6a60cda7 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -6,7 +6,7 @@ , installShellFiles , xorg , gtk3 -, webkitgtk +, webkitgtk_4_0 , snippetexpanderd , snippetexpanderx }: @@ -32,7 +32,7 @@ buildGoModule rec { buildInputs = [ xorg.libX11 gtk3 - webkitgtk + webkitgtk_4_0 snippetexpanderd snippetexpanderx ]; diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index f394cce79ada..4ed964773063 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -4,7 +4,7 @@ freetype, libsoup, gtk3, - webkitgtk, + webkitgtk_4_0, pkg-config, wrapGAppsHook3, parallel-disk-usage, @@ -66,7 +66,7 @@ in ''; nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; - buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; + buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk_4_0]; # Disable checkPhase, since the project doesn't contain tests doCheck = false; diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index 045823a5836e..67023591b2b7 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -15,7 +15,7 @@ , openssl , pkg-config , rustPlatform -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , sqlite }: @@ -97,7 +97,7 @@ rustPlatform.buildRustPackage { freetype libsoup gtk3 - webkitgtk + webkitgtk_4_0 gsettings-desktop-schemas sqlite ]; diff --git a/pkgs/by-name/xi/xiphos/package.nix b/pkgs/by-name/xi/xiphos/package.nix index d3aaa70fc9af..b6b01ae0770f 100644 --- a/pkgs/by-name/xi/xiphos/package.nix +++ b/pkgs/by-name/xi/xiphos/package.nix @@ -22,7 +22,7 @@ , minizip , pkg-config , sword -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , yelp-tools , zip @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { libuuid minizip sword - webkitgtk + webkitgtk_4_0 ]; cmakeFlags = [ diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index 0f9c89140a9a..ec465aa8d783 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -139,7 +139,7 @@ in addToNativeBuildInputs pkgs.taglib old ); uuid-lib = addToBuildInputs pkgs.libuuid; - webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk; + webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; yaml = addToBuildInputs pkgs.libyaml; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5502eb170378..885e78c922d2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -124113,7 +124113,7 @@ self: { "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk + , text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-javascriptcore"; @@ -124124,11 +124124,11 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-javascriptcore_6_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib @@ -124469,7 +124469,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit"; @@ -124484,17 +124484,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit bindings"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk + , haskell-gi-overloading, text, transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2"; @@ -124509,17 +124509,17 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers, webkitgtk + , transformers, webkitgtk_4_0 }: mkDerivation { pname = "gi-webkit2webextension"; @@ -124534,13 +124534,13 @@ self: { gi-javascriptcore gi-soup haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; description = "WebKit2-WebExtension bindings"; license = lib.licenses.lgpl21Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "gi-webkitwebprocessextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk @@ -309518,7 +309518,7 @@ self: { , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , mime-types, mtl, network, process, random, scientific, split , tasty, tasty-quickcheck, text, transformers, unordered-containers - , utf8-string, vector, webkitgtk, xdg-basedir, xmonad + , utf8-string, vector, webkitgtk_4_0, xdg-basedir, xmonad , xmonad-contrib }: mkDerivation { @@ -309537,7 +309537,7 @@ self: { mime-types mtl network process random scientific split text transformers unordered-containers utf8-string vector xdg-basedir ]; - executablePkgconfigDepends = [ gtk3 webkitgtk ]; + executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ]; testHaskellDepends = [ aeson base bytestring containers dbus directory filepath gi-gdk gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens @@ -309550,7 +309550,7 @@ self: { hydraPlatforms = lib.platforms.none; mainProgram = "tianbar"; broken = true; - }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;}; "tibetan-utils" = callPackage ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec @@ -332056,30 +332056,30 @@ self: { setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; libraryPkgconfigDepends = [ webkit ]; - description = "JavaScriptCore FFI from webkitgtk"; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; }) {webkit = null;}; "webkit2gtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkit2gtk3-javascriptcore"; version = "0.14.4.6"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers - , webkitgtk + , webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3"; @@ -332090,27 +332090,27 @@ self: { libraryHaskellDepends = [ base bytestring cairo glib gtk3 mtl pango text transformers ]; - libraryPkgconfigDepends = [ webkitgtk ]; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; libraryToolDepends = [ gtk2hs-buildtools ]; description = "Binding to the Webkit library"; license = lib.licenses.lgpl21Only; hydraPlatforms = lib.platforms.none; broken = true; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webkitgtk3-javascriptcore" = callPackage - ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: + ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }: mkDerivation { pname = "webkitgtk3-javascriptcore"; version = "0.14.2.1"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ base ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore FFI from webkitgtk"; + libraryPkgconfigDepends = [ webkitgtk_4_0 ]; + description = "JavaScriptCore FFI from webkitgtk_4_0"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {inherit (pkgs) webkitgtk;}; + }) {inherit (pkgs) webkitgtk_4_0;}; "webmention" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, either diff --git a/pkgs/development/libraries/rnnoise-plugin/default.nix b/pkgs/development/libraries/rnnoise-plugin/default.nix index 13107bfcb13b..4cf983add42b 100644 --- a/pkgs/development/libraries/rnnoise-plugin/default.nix +++ b/pkgs/development/libraries/rnnoise-plugin/default.nix @@ -6,7 +6,7 @@ , gtk3-x11 , pcre , pkg-config -, webkitgtk +, webkitgtk_4_0 , xorg , WebKit , MetalKit @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit MetalKit diff --git a/pkgs/development/libraries/wxwidgets/wxGTK31.nix b/pkgs/development/libraries/wxwidgets/wxGTK31.nix index 21333afe5e8e..1379a15801e6 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK31.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK31.nix @@ -20,7 +20,7 @@ , withEGL ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? stdenv.hostPlatform.isDarwin -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withCurl curl ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk + ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ setfile diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 055000cfa68c..fed9c5330610 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -22,7 +22,7 @@ , unicode ? true , withMesa ? !stdenv.hostPlatform.isDarwin , withWebKit ? true -, webkitgtk +, webkitgtk_4_0 , setfile , AGL , Carbon @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { xorgproto ] ++ lib.optional withMesa libGLU - ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk + ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0 ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit ++ lib.optionals stdenv.hostPlatform.isDarwin [ expat diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix index af6334671230..9ce7655903a7 100644 --- a/pkgs/development/lisp-modules/ql.nix +++ b/pkgs/development/lisp-modules/ql.nix @@ -65,7 +65,7 @@ let nativeLibs = [ pkgs.sqlite ]; }); cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { - nativeLibs = [ pkgs.webkitgtk ]; + nativeLibs = [ pkgs.webkitgtk_4_0 ]; }); dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { nativeLibs = [ pkgs.mariadb.client ]; diff --git a/pkgs/development/misc/juce/default.nix b/pkgs/development/misc/juce/default.nix index cbb5411314f0..610434dfe624 100644 --- a/pkgs/development/misc/juce/default.nix +++ b/pkgs/development/misc/juce/default.nix @@ -13,7 +13,7 @@ , freetype , curl , libglvnd -, webkitgtk +, webkitgtk_4_0 , pcre , darwin }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib # libasound.so libglvnd # libGL.so - webkitgtk # webkit2gtk-4.0 + webkitgtk_4_0 # webkit2gtk-4.0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.MetalKit diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index be3a181da9aa..89eac63a4a7e 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -30,7 +30,7 @@ mesa, pango, SDL, - webkitgtk, + webkitgtk_4_0, wxGTK, xorgproto, @@ -93,7 +93,7 @@ buildPythonPackage rec { libXxf86vm libglvnd mesa - webkitgtk + webkitgtk_4_0 xorgproto ]; diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 057c0d1e9df5..2236d27be2b3 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -18,7 +18,7 @@ , rustPlatform , stdenv , testers -, webkitgtk +, webkitgtk_4_0 }: let @@ -146,7 +146,7 @@ rec { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 libayatana-appindicator - webkitgtk + webkitgtk_4_0 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 5aea91699a22..6c698c3a517f 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -14,7 +14,7 @@ , shared-mime-info , stdenv , unzip -, webkitgtk +, webkitgtk_4_0 , zlib }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/ makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_0 ])} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { libXtst zlib shared-mime-info - webkitgtk + webkitgtk_4_0 ]; dontBuild = true; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index de73c6b63764..4ae5a8bd63a5 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -9,7 +9,7 @@ , zlib # Linux specific dependencies , gtk3 -, webkitgtk +, webkitgtk_4_0 }: buildGoModule rec { @@ -48,7 +48,7 @@ buildGoModule rec { nodejs ] ++ lib.optionals stdenv.hostPlatform.isLinux [ gtk3 - webkitgtk + webkitgtk_4_0 ]; ldflags = [ @@ -60,7 +60,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/wails \ --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk ])}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.hostPlatform.isLinux [ gtk3 webkitgtk_4_0 ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index e9352822b3bb..7de90857c06e 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -8,7 +8,7 @@ , libwpe , libwpe-fdo , glib-networking -, webkitgtk +, webkitgtk_4_0 , makeWrapper , wrapGAppsHook3 , adwaita-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { wayland libwpe libwpe-fdo - webkitgtk + webkitgtk_4_0 glib-networking gdk-pixbuf adwaita-icon-theme diff --git a/pkgs/games/gamehub/default.nix b/pkgs/games/gamehub/default.nix index 3bfbe71c3c0e..4367de30f5d9 100644 --- a/pkgs/games/gamehub/default.nix +++ b/pkgs/games/gamehub/default.nix @@ -13,7 +13,7 @@ , libsoup , json-glib , sqlite -, webkitgtk +, webkitgtk_4_0 , libmanette , libXtst , wrapGAppsHook3 @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libsoup libXtst sqlite - webkitgtk + webkitgtk_4_0 ]; meta = with lib; { diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index 7afbce58c106..9f3edad29a3b 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -4,7 +4,7 @@ , makeWrapper , jdk , libsecret -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , _7zz , nixosTests @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \ --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 7b92c9e3e86b..866d56b156ea 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, -cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, +cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk_4_0, libnotify, sqlite, vala, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ]; - buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; + buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk_4_0 libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' substituteInPlace install.py \ diff --git a/pkgs/tools/networking/gp-saml-gui/default.nix b/pkgs/tools/networking/gp-saml-gui/default.nix index f28306880f62..1426d13ed22b 100644 --- a/pkgs/tools/networking/gp-saml-gui/default.nix +++ b/pkgs/tools/networking/gp-saml-gui/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , buildPythonPackage -, webkitgtk +, webkitgtk_4_0 , wrapGAppsHook3 , glib-networking , gobject-introspection @@ -29,7 +29,7 @@ buildPythonPackage rec { requests pygobject3 openconnect - ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk; + ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 844574c1f3b4..f227b0fbaec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29155,11 +29155,6 @@ with pkgs; foliate = callPackage ../applications/office/foliate { }; - font-manager = callPackage ../by-name/fo/font-manager/package.nix { - libsoup = libsoup_3; - webkitgtk = webkitgtk_6_0; - }; - fontfinder = callPackage ../applications/misc/fontfinder { }; fontpreview = callPackage ../applications/misc/fontpreview { }; @@ -30749,10 +30744,7 @@ with pkgs; lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { - libsoup = libsoup_3; - webkitgtk = webkitgtk_4_1; - }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; lightworks = callPackage ../applications/video/lightworks { }; @@ -31307,9 +31299,7 @@ with pkgs; netmaker = callPackage ../applications/networking/netmaker {subPackages = ["."];}; netmaker-full = callPackage ../applications/networking/netmaker { }; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { - webkitgtk = webkitgtk_6_0; - }; + newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nice-dcv-client = callPackage ../applications/networking/remote/nice-dcv-client { }; @@ -32176,7 +32166,7 @@ with pkgs; }; quodlibet-full = quodlibet.override { - inherit gtksourceview webkitgtk; + inherit gtksourceview webkitgtk_4_0; kakasi = kakasi; keybinder3 = keybinder3; libappindicator-gtk3 = libappindicator-gtk3; @@ -38181,7 +38171,9 @@ with pkgs; wcalc = callPackage ../applications/misc/wcalc { }; - webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { + webkitgtk = webkitgtk_4_0; + }; websocketd = callPackage ../applications/networking/websocketd { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 57c07c1bde4c..d2a1f8a25887 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -143,7 +143,7 @@ in util-linux = linux; util-linuxMinimal = linux; w3m = all; - webkitgtk = linux; + webkitgtk_4_0 = linux; wget = all; which = all; wirelesstools = linux;