nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

treewide: replace webkitgtk to webkitgtk_4_0

Browse Source 
sed -i 's/ webkitgtk\b/ webkitgtk_4_0/g' pkgs/**.nix
sed -i 's/(webkitgtk\b/(webkitgtk_4_0/g' pkgs/**.nix
sed -i 's/\.webkitgtk\b/.webkitgtk_4_0/g' pkgs/**.nix

webkitgtk is currently pointing to that specific ABI version but the
alias is going to start warning
This commit is contained in:
Fabián Heredia Montiel 2024-10-04 19:00:54 -06:00
parent c7739bb95e
commit ccec93c1c7
108 changed files with 248 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/audio/bespokesynth/default.nix
View File

@ -24,7 +24,7 @@
, xcbutilkeysyms , xcbutilkeysyms
, xcb-util-cursor , xcb-util-cursor
, gtk3 , gtk3
, webkitgtk , webkitgtk_4_0
, python3 , python3
, curl , curl
, pcre , pcre
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
libXScrnSaver libXScrnSaver
curl curl
gtk3 gtk3
webkitgtk webkitgtk_4_0
freetype freetype
libGL libGL
libusb1 libusb1

4
pkgs/applications/audio/exaile/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub { stdenv, lib, fetchFromGitHub
, gobject-introspection, makeWrapper, wrapGAppsHook3 , gobject-introspection, makeWrapper, wrapGAppsHook3
, gtk3, gst_all_1, python3 , 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 , iconTheme ? adwaita-icon-theme
, deviceDetectionSupport ? true , deviceDetectionSupport ? true
, documentationSupport ? true , documentationSupport ? true
@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
++ lib.optional multimediaKeySupport keybinder3 ++ lib.optional multimediaKeySupport keybinder3
++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs ++ lib.optional (musicBrainzSupport || cdMetadataSupport) python3.pkgs.musicbrainzngs
++ lib.optional podcastSupport python3.pkgs.feedparser ++ lib.optional podcastSupport python3.pkgs.feedparser
++ lib.optional wikipediaSupport webkitgtk; ++ lib.optional wikipediaSupport webkitgtk_4_0;
nativeCheckInputs = with python3.pkgs; [ nativeCheckInputs = with python3.pkgs; [
pytest pytest

4
pkgs/applications/audio/plugdata/default.nix
View File

@ -8,7 +8,7 @@
, pkg-config , pkg-config
, alsa-lib , alsa-lib
, freetype , freetype
, webkitgtk , webkitgtk_4_0
, zenity , zenity
, curl , curl
, xorg , xorg
@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib alsa-lib
curl curl
freetype freetype
webkitgtk webkitgtk_4_0
xorg.libX11 xorg.libX11
xorg.libXcursor xorg.libXcursor
xorg.libXext xorg.libXext

4
pkgs/applications/audio/quodlibet/default.nix
View File

@ -21,7 +21,7 @@
libmodplug, libmodplug,
librsvg, librsvg,
libsoup, libsoup,
webkitgtk, webkitgtk_4_0,
# optional features # optional features
withDbusPython ? false, withDbusPython ? false,
@ -90,7 +90,7 @@ python3.pkgs.buildPythonApplication {
libappindicator-gtk3 libappindicator-gtk3
libmodplug libmodplug
libsoup libsoup
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals (withXineBackend) [ xine-lib ] ++ lib.optionals (withXineBackend) [ xine-lib ]
++ lib.optionals (withGstreamerBackend) ( ++ lib.optionals (withGstreamerBackend) (

4
pkgs/applications/audio/rymcast/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper { lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
, alsa-lib, curl, gtk3, webkitgtk, zenity }: , alsa-lib, curl, gtk3, webkitgtk_4_0, zenity }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rymcast"; pname = "rymcast";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; 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 = '' installPhase = ''
mkdir -p "$out/bin" mkdir -p "$out/bin"

4
pkgs/applications/audio/sonobus/default.nix
View File

@ -16,7 +16,7 @@
, libopus , libopus
, curl , curl
, gtk3 , gtk3
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
libopus libopus
curl curl
gtk3 gtk3
webkitgtk webkitgtk_4_0
]; ];
runtimeDependencies = [ runtimeDependencies = [

4
pkgs/applications/audio/tonelib-zoom/default.nix
View File

@ -12,7 +12,7 @@
, libXrandr , libXrandr
, libXrender , libXrender
, libjack2 , libjack2
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
alsa-lib alsa-lib
freetype freetype
libglvnd libglvnd
webkitgtk webkitgtk_4_0
] ++ runtimeDependencies; ] ++ runtimeDependencies;
runtimeDependencies = map lib.getLib [ runtimeDependencies = map lib.getLib [

4
pkgs/applications/audio/tunefish/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, python3 { 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 { stdenv.mkDerivation {
@ -15,7 +15,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkg-config python3 ]; 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 = '' postPatch = ''
patchShebangs src/tunefish4/generate-lv2-ttl.py patchShebangs src/tunefish4/generate-lv2-ttl.py

4
pkgs/applications/audio/vocal/default.nix
View File

@ -12,7 +12,7 @@
, glib , glib
, glib-networking , glib-networking
, libxml2 , libxml2
, webkitgtk , webkitgtk_4_0
, clutter-gtk , clutter-gtk
, clutter-gst , clutter-gst
, libunity , libunity
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
libunity libunity
pantheon.granite pantheon.granite
sqlite sqlite
webkitgtk webkitgtk_4_0
glib-networking glib-networking
]; ];

4
pkgs/applications/blockchains/alfis/default.nix
View File

@ -5,7 +5,7 @@
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
makeWrapper, makeWrapper,
webkitgtk, webkitgtk_4_0,
zenity, zenity,
Cocoa, Cocoa,
Security, Security,
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
]; ];
buildInputs = buildInputs =
lib.optional stdenv.hostPlatform.isDarwin Security 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) [ ++ lib.optionals (withGui && stdenv.hostPlatform.isDarwin) [
Cocoa Cocoa
WebKit WebKit

6
pkgs/applications/editors/eclipse/build-eclipse.nix
View File

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

4
pkgs/applications/editors/eclipse/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper { lib, stdenv, fetchurl, makeDesktopItem, makeWrapper
, freetype, fontconfig, libX11, libXrender, zlib , freetype, fontconfig, libX11, libXrender, zlib
, glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , 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 , buildEnv, runCommand
, callPackage , callPackage
}: }:
@ -29,7 +29,7 @@ in rec {
# work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3 # work around https://bugs.eclipse.org/bugs/show_bug.cgi?id=476075#c3
buildEclipseUnversioned = callPackage ./build-eclipse.nix { buildEclipseUnversioned = callPackage ./build-eclipse.nix {
inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib 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; makeWrapper;
}; };
buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; }); buildEclipse = eclipseData: buildEclipseUnversioned (eclipseData // { productVersion = "${platform_major}.${platform_minor}"; });

4
pkgs/applications/editors/emacs/make-emacs.nix
View File

@ -55,7 +55,7 @@
, systemd , systemd
, tree-sitter , tree-sitter
, texinfo , texinfo
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, zlib , zlib
@ -274,7 +274,7 @@ mkDerivation (finalAttrs: {
] ++ lib.optionals withXinput2 [ ] ++ lib.optionals withXinput2 [
libXi libXi
] ++ lib.optionals withXwidgets [ ] ++ lib.optionals withXwidgets [
webkitgtk webkitgtk_4_0
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
sigtool sigtool
] ++ lib.optionals withNS [ ] ++ lib.optionals withNS [

4
pkgs/applications/editors/formiko/default.nix
View File

@ -9,7 +9,7 @@
, gtkspell3 , gtkspell3
, librsvg , librsvg
, pygobject3 , pygobject3
, webkitgtk , webkitgtk_4_0
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -36,7 +36,7 @@ buildPythonApplication rec {
gtkspell3 gtkspell3
librsvg librsvg
pygobject3 pygobject3
webkitgtk webkitgtk_4_0
]; ];
# Needs a display # Needs a display

4
pkgs/applications/editors/gnome-inform7/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, python3, perl, bison
, texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons , texinfo, desktop-file-utils, wrapGAppsHook3, docbook2x, docbook-xsl-nons
, inform7, gettext, libossp_uuid, gtk3, gobject-introspection, vala, gtk-doc , 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 }: , gst_all_1 }:
# Neither gnome-inform7 nor its dependencies ratify and chimara have tagged releases in the GTK3 branch yet. # 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 gtk3
gtksourceview3 gtksourceview3
gspell gspell
webkitgtk webkitgtk_4_0
libxml2 libxml2
goocanvas2 goocanvas2
libplist libplist

4
pkgs/applications/editors/rednotebook/default.nix
View File

@ -1,5 +1,5 @@
{ lib, buildPythonApplication, fetchFromGitHub { 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 , pygobject3, pyyaml, setuptools
}: }:
@ -23,7 +23,7 @@ buildPythonApplication rec {
build-system = [ setuptools ]; build-system = [ setuptools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk_4_0
pygobject3 pyyaml pygobject3 pyyaml
]; ];

4
pkgs/applications/file-managers/xplorer/default.nix
View File

@ -13,7 +13,7 @@
, openssl , openssl
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, webkitgtk , webkitgtk_4_0
}: }:
let let
@ -74,7 +74,7 @@ rustPlatform.buildRustPackage {
''; '';
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk ]; buildInputs = [ dbus openssl freetype libsoup gtk3 webkitgtk_4_0 ];
checkFlags = [ checkFlags = [
# tries to mutate the parent directory # tries to mutate the parent directory

4
pkgs/applications/graphics/gthumb/default.nix
View File

@ -31,7 +31,7 @@
, python3 , python3
, desktop-file-utils , desktop-file-utils
, itstool , itstool
, withWebservices ? true, webkitgtk , withWebservices ? true, webkitgtk_4_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
libtiff libtiff
libwebp libwebp
libX11 libX11
] ++ lib.optional withWebservices webkitgtk; ] ++ lib.optional withWebservices webkitgtk_4_0;
mesonFlags = [ mesonFlags = [
"-Dlibchamplain=true" "-Dlibchamplain=true"

4
pkgs/applications/graphics/komorebi/default.nix
View File

@ -7,7 +7,7 @@
, glib , glib
, gtk3 , gtk3
, libgee , libgee
, webkitgtk , webkitgtk_4_0
, clutter-gtk , clutter-gtk
, clutter-gst , clutter-gst
, ninja , ninja
@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
glib glib
gtk3 gtk3
libgee libgee
webkitgtk webkitgtk_4_0
clutter-gtk clutter-gtk
clutter-gst clutter-gst
]; ];

4
pkgs/applications/misc/bambu-studio/default.nix
View File

@ -39,7 +39,7 @@
pcre, pcre,
systemd, systemd,
tbb_2021_11, tbb_2021_11,
webkitgtk, webkitgtk_4_0,
wxGTK31, wxGTK31,
xorg, xorg,
withSystemd ? stdenv.hostPlatform.isLinux, withSystemd ? stdenv.hostPlatform.isLinux,
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
openvdb_tbb_2021_8 openvdb_tbb_2021_8
pcre pcre
tbb_2021_11 tbb_2021_11
webkitgtk webkitgtk_4_0
wxGTK31' wxGTK31'
xorg.libX11 xorg.libX11
] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs; ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;

4
pkgs/applications/misc/holochain-launcher/default.nix
View File

@ -4,7 +4,7 @@
, autoPatchelfHook , autoPatchelfHook
, dpkg , dpkg
, openssl , openssl
, webkitgtk , webkitgtk_4_0
, libappindicator , libappindicator
, wrapGAppsHook3 , wrapGAppsHook3
, shared-mime-info , shared-mime-info
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
openssl openssl
webkitgtk webkitgtk_4_0
libappindicator libappindicator
glib-networking glib-networking

4
pkgs/applications/misc/insulator2/default.nix
View File

@ -7,7 +7,7 @@
, freetype , freetype
, libsoup , libsoup
, gtk3 , gtk3
, webkitgtk , webkitgtk_4_0
, perl , perl
, cyrus_sasl , cyrus_sasl
, stdenv , stdenv
@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
freetype freetype
libsoup libsoup
gtk3 gtk3
webkitgtk webkitgtk_4_0
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/applications/misc/lutris/default.nix
View File

@ -13,7 +13,7 @@
, gtk3 , gtk3
, libnotify , libnotify
, pango , pango
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
# check inputs # check inputs
@ -93,7 +93,7 @@ buildPythonApplication rec {
gtk3 gtk3
libnotify libnotify
pango pango
webkitgtk webkitgtk_4_0
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gst-libav gst-libav
gst-plugins-bad gst-plugins-bad

2
pkgs/applications/misc/lutris/fhsenv.nix
View File

@ -7,7 +7,7 @@
let let
qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; 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; [ xorgDeps = pkgs: with pkgs.xorg; [
libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp
libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite

4
pkgs/applications/misc/minigalaxy/default.nix
View File

@ -9,7 +9,7 @@
, steam-run , steam-run
, substituteAll , substituteAll
, unzip , unzip
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
}: }:
@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = [ pythonPath = [
python3Packages.pygobject3 python3Packages.pygobject3
python3Packages.requests python3Packages.requests
webkitgtk webkitgtk_4_0
]; ];
dontWrapGApps = true; dontWrapGApps = true;

4
pkgs/applications/misc/pdfpc/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 , 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 { stdenv.mkDerivation rec {
pname = "pdfpc"; pname = "pdfpc";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
(gst-plugins-good.override { gtkSupport = true; }) (gst-plugins-good.override { gtkSupport = true; })
gst-libav gst-libav
qrencode qrencode
webkitgtk webkitgtk_4_0
discount discount
json-glib json-glib
]; ];

4
pkgs/applications/misc/pytrainer/default.nix
View File

@ -11,7 +11,7 @@
, perl , perl
, sqlite , sqlite
, tzdata , tzdata
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, xvfb-run , xvfb-run
}: }:
@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
sqlite sqlite
gtk3 gtk3
webkitgtk webkitgtk_4_0
glib-networking glib-networking
adwaita-icon-theme adwaita-icon-theme
gdk-pixbuf gdk-pixbuf

4
pkgs/applications/misc/skytemple/default.nix
View File

@ -3,7 +3,7 @@
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, gtksourceview4 , gtksourceview4
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, python3Packages , python3Packages
}: }:
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
# webkitgtk is used for rendering interactive statistics graph which # webkitgtk is used for rendering interactive statistics graph which
# can be seen by opening a ROM, entering Pokemon section, selecting # can be seen by opening a ROM, entering Pokemon section, selecting
# any Pokemon, and clicking Stats and Moves tab. # any Pokemon, and clicking Stats and Moves tab.
webkitgtk webkitgtk_4_0
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

4
pkgs/applications/misc/ulauncher/default.nix
View File

@ -8,7 +8,7 @@
, gobject-introspection , gobject-introspection
, gtk3 , gtk3
, wrapGAppsHook3 , wrapGAppsHook3
, webkitgtk , webkitgtk_4_0
, libnotify , libnotify
, keybinder3 , keybinder3
, libappindicator , libappindicator
@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec {
libappindicator libappindicator
libnotify libnotify
librsvg librsvg
webkitgtk webkitgtk_4_0
wmctrl wmctrl
]; ];

4
pkgs/applications/networking/apache-directory-studio/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
pname = "apache-directory-studio"; pname = "apache-directory-studio";
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
makeWrapper "$dest/ApacheDirectoryStudio" \ makeWrapper "$dest/ApacheDirectoryStudio" \
"$out/bin/ApacheDirectoryStudio" \ "$out/bin/ApacheDirectoryStudio" \
--prefix PATH : "${jdk}/bin" \ --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 icon.xpm "$out/share/pixmaps/apache-directory-studio.xpm"
install -D -t "$out/share/applications" ${desktopItem}/share/applications/* install -D -t "$out/share/applications" ${desktopItem}/share/applications/*
''; '';

4
pkgs/applications/networking/browsers/badwolf/default.nix
View File

@ -5,7 +5,7 @@
, pkg-config , pkg-config
, ed , ed
, wrapGAppsHook3 , wrapGAppsHook3
, webkitgtk , webkitgtk_4_0
, libxml2 , libxml2
, glib-networking , glib-networking
, gettext , gettext
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
webkitgtk webkitgtk_4_0
libxml2 libxml2
gettext gettext
glib-networking glib-networking

4
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -1,5 +1,5 @@
{ lib, fetchgit, meson, ninja, pkg-config, nix-update-script { 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 , glib-networking, gtkspell3, hunspell, desktop-file-utils
, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }: , gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:
@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
gtkspell3 gtkspell3
hunspell hunspell
libsecret libsecret
webkitgtk webkitgtk_4_0
glib glib
]; ];

4
pkgs/applications/networking/browsers/ephemeral/default.nix
View File

@ -13,7 +13,7 @@
, pantheon , pantheon
, pkg-config , pkg-config
, python3 , python3
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, glib-networking , glib-networking
}: }:
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
libdazzle libdazzle
libgee libgee
pantheon.granite pantheon.granite
webkitgtk webkitgtk_4_0
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/networking/browsers/luakit/default.nix
View File

@ -10,7 +10,7 @@
, luafilesystem , luafilesystem
, luajit , luajit
, sqlite , sqlite
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
luafilesystem luafilesystem
luajit luajit
sqlite sqlite
webkitgtk webkitgtk_4_0
] ++ ( with gst_all_1; [ ] ++ ( with gst_all_1; [
gstreamer gstreamer
gst-plugins-base gst-plugins-base

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -9,7 +9,7 @@
, gcr , gcr
, libpeas , libpeas
, gtk3 , gtk3
, webkitgtk , webkitgtk_4_0
, sqlite , sqlite
, gsettings-desktop-schemas , gsettings-desktop-schemas
, libsoup , libsoup
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
gtk3 gtk3
libpeas libpeas
sqlite sqlite
webkitgtk webkitgtk_4_0
json-glib json-glib
libarchive libarchive
]; ];

4
pkgs/applications/networking/browsers/nyxt/default.nix
View File

@ -15,7 +15,7 @@
, gdk-pixbuf , gdk-pixbuf
, cairo , cairo
, pango , pango
, webkitgtk , webkitgtk_4_0
, openssl , openssl
, gstreamer , gstreamer
, gst-libav , gst-libav
@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
cairo cairo
pango pango
gtk3 gtk3
webkitgtk webkitgtk_4_0
openssl openssl
libfixposix libfixposix
]; ];

6
pkgs/applications/networking/browsers/surf/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit { lib, stdenv, fetchgit
, pkg-config, wrapGAppsHook3 , 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 , xorg, dmenu, findutils, gnused, coreutils, gst_all_1
, patches ? null , patches ? null
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas gsettings-desktop-schemas
gtk gtk
libsoup libsoup
webkitgtk webkitgtk_4_0
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
# Audio & video support for webkitgtk WebView # Audio & video support for webkitgtk WebView
gstreamer gstreamer
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://surf.suckless.org"; homepage = "https://surf.suckless.org";
license = licenses.mit; license = licenses.mit;
platforms = webkitgtk.meta.platforms; platforms = webkitgtk_4_0.meta.platforms;
maintainers = with maintainers; [ joachifm ]; maintainers = with maintainers; [ joachifm ];
}; };
} }

4
pkgs/applications/networking/browsers/vimb/default.nix
View File

@ -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 , gsettings-desktop-schemas, wrapGAppsHook3
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; 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 = { passthru = {
inherit gtk3; inherit gtk3;

4
pkgs/applications/networking/feedreaders/newsflash/default.nix
View File

@ -18,7 +18,7 @@
libxml2, libxml2,
openssl, openssl,
sqlite, sqlite,
webkitgtk, webkitgtk_6_0,
glib-networking, glib-networking,
librsvg, librsvg,
gst_all_1, gst_all_1,
@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
libxml2 libxml2
openssl openssl
sqlite sqlite
webkitgtk webkitgtk_6_0
# TLS support for loading external content in webkitgtk WebView # TLS support for loading external content in webkitgtk WebView
glib-networking glib-networking

4
pkgs/applications/networking/geph/default.nix
View File

@ -11,7 +11,7 @@
perl, perl,
pkg-config, pkg-config,
glib, glib,
webkitgtk, webkitgtk_4_0,
libayatana-appindicator, libayatana-appindicator,
cairo, cairo,
openssl, openssl,
@ -88,7 +88,7 @@ in
buildInputs = [ buildInputs = [
glib glib
webkitgtk webkitgtk_4_0
libayatana-appindicator libayatana-appindicator
cairo cairo
openssl openssl

4
pkgs/applications/networking/giara/default.nix
View File

@ -8,7 +8,7 @@
, wrapGAppsHook4 , wrapGAppsHook4
, gtk4 , gtk4
, gdk-pixbuf , gdk-pixbuf
, webkitgtk , webkitgtk_4_0
, gtksourceview5 , gtksourceview5
, glib-networking , glib-networking
, libadwaita , libadwaita
@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gtk4 gtk4
gdk-pixbuf gdk-pixbuf
webkitgtk webkitgtk_4_0
gtksourceview5 gtksourceview5
glib-networking glib-networking
libadwaita libadwaita

4
pkgs/applications/networking/instant-messengers/trillian-im/default.nix
View File

@ -16,7 +16,7 @@
, librsvg , librsvg
, libzip , libzip
, openssl , openssl
, webkitgtk , webkitgtk_4_0
, libappindicator-gtk3 , libappindicator-gtk3
}: }:
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
librsvg librsvg
libzip libzip
openssl openssl
webkitgtk webkitgtk_4_0
libappindicator-gtk3 libappindicator-gtk3
]; ];

4
pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
View File

@ -20,7 +20,7 @@
, pcre , pcre
, pcre2 , pcre2
, pkg-config , pkg-config
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, xorg , xorg
}: }:
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre pcre
pcre2 pcre2
sqlite sqlite
webkitgtk webkitgtk_4_0
xorg.libXdmcp xorg.libXdmcp
xorg.libXtst xorg.libXtst
]; ];

4
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -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 , libsass, notmuch, boost, wrapGAppsHook3, glib-networking, protobuf
, gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtkmm3 gmime3 webkitgtk libsass libpeas gtkmm3 gmime3 webkitgtk_4_0 libsass libpeas
python3 python3
notmuch boost gsettings-desktop-schemas adwaita-icon-theme notmuch boost gsettings-desktop-schemas adwaita-icon-theme
glib-networking protobuf glib-networking protobuf

4
pkgs/applications/networking/mailreaders/balsa/default.nix
View File

@ -18,7 +18,7 @@
, openssl , openssl
, pkg-config , pkg-config
, sqlite , sqlite
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
}: }:
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
libsecret libsecret
openssl openssl
sqlite sqlite
webkitgtk webkitgtk_4_0
]; ];
configureFlags = [ configureFlags = [

4
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View File

@ -31,7 +31,7 @@
, enablePluginBsfilter ? true , enablePluginBsfilter ? true
, enablePluginClamd ? true , enablePluginClamd ? true
, enablePluginDillo ? true , enablePluginDillo ? true
, enablePluginFancy ? true, webkitgtk , enablePluginFancy ? true, webkitgtk_4_0
, enablePluginFetchInfo ? true , enablePluginFetchInfo ? true
, enablePluginKeywordWarner ? true , enablePluginKeywordWarner ? true
, enablePluginLibravatar ? enablePluginRavatar , enablePluginLibravatar ? enablePluginRavatar
@ -67,7 +67,7 @@ let
{ flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; } { flags = [ "dbus" ]; enabled = enableDbus; deps = [ dbus dbus-glib ]; }
{ flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; } { flags = [ "dillo-plugin" ]; enabled = enablePluginDillo; }
{ flags = [ "enchant" ]; enabled = enableEnchant; deps = [ enchant ]; } { 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 = [ "fetchinfo-plugin" ]; enabled = enablePluginFetchInfo; }
{ flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; } { flags = [ "keyword_warner-plugin" ]; enabled = enablePluginKeywordWarner; }
{ flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; } { flags = [ "gnutls" ]; enabled = enableGnuTLS; deps = [ gnutls ]; }

8
pkgs/applications/networking/newsreaders/liferea/default.nix
View File

@ -8,8 +8,8 @@
, libxml2 , libxml2
, libxslt , libxslt
, sqlite , sqlite
, libsoup , libsoup_3
, webkitgtk , webkitgtk_4_1
, json-glib , json-glib
, gst_all_1 , gst_all_1
, libnotify , libnotify
@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
gtk3 gtk3
webkitgtk webkitgtk_4_1
libxml2 libxml2
libxslt libxslt
sqlite sqlite
libsoup libsoup_3
libpeas libpeas
gsettings-desktop-schemas gsettings-desktop-schemas
json-glib json-glib

4
pkgs/applications/networking/remote/citrix-workspace/generic.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook3, which, more { 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 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2
, gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2
, libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin , libjpeg, libredirect, tzdata, cacert, systemd, libcxx, symlinkJoin
@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf gdk-pixbuf
gnome2.gtkglext gnome2.gtkglext
glib-networking glib-networking
webkitgtk webkitgtk_4_0
gtk2 gtk2
gtk2-x11 gtk2-x11
gtk3 gtk3

4
pkgs/applications/networking/weather/meteo/default.nix
View File

@ -16,7 +16,7 @@
, json-glib , json-glib
, libappindicator , libappindicator
, libsoup , libsoup
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
json-glib json-glib
libappindicator libappindicator
libsoup libsoup
webkitgtk webkitgtk_4_0
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/office/bookworm/default.nix
View File

@ -23,7 +23,7 @@
, unar , unar
, unzip , unzip
, vala , vala
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
}: }:
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
poppler poppler
python3 python3
sqlite sqlite
webkitgtk webkitgtk_4_0
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/office/notes-up/default.nix
View File

@ -17,7 +17,7 @@
, libgee , libgee
, pantheon , pantheon
, sqlite , sqlite
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
libgee libgee
pantheon.granite pantheon.granite
sqlite sqlite
webkitgtk webkitgtk_4_0
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/office/osmo/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify { 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 { stdenv.mkDerivation rec {
pname = "osmo"; pname = "osmo";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ];
buildInputs = [ gtk3 libxml2 libical libnotify libarchive buildInputs = [ gtk3 libxml2 libical libnotify libarchive
gspell webkitgtk libgringotts ]; gspell webkitgtk_4_0 libgringotts ];
meta = with lib; { meta = with lib; {
description = "Handy personal organizer"; description = "Handy personal organizer";

4
pkgs/applications/science/math/nasc/default.nix
View File

@ -11,7 +11,7 @@
, gtksourceview , gtksourceview
, libgee , libgee
, nix-update-script , nix-update-script
, webkitgtk , webkitgtk_4_0
, libqalculate , libqalculate
, intltool , intltool
, gnuplot , gnuplot
@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
gtksourceview gtksourceview
libgee libgee
pantheon.granite pantheon.granite
webkitgtk webkitgtk_4_0
# We add libqalculate's runtime dependencies because nasc has it as a modified subproject. # We add libqalculate's runtime dependencies because nasc has it as a modified subproject.
] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs;

4
pkgs/applications/video/obs-studio/plugins/obs-webkitgtk.nix
View File

@ -2,7 +2,7 @@
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, obs-studio , obs-studio
, webkitgtk , webkitgtk_4_0
, glib-networking , glib-networking
, meson , meson
, cmake , cmake
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
obs-studio obs-studio
webkitgtk webkitgtk_4_0
glib-networking glib-networking
]; ];

4
pkgs/by-name/am/am2rlauncher/package.nix
View File

@ -4,7 +4,7 @@
, glibc , glibc
, gtk3 , gtk3
, libappindicator , libappindicator
, webkitgtk , webkitgtk_4_0
, e2fsprogs , e2fsprogs
, libnotify , libnotify
, libgit2 , libgit2
@ -63,7 +63,7 @@ buildDotnetModule {
glibc glibc
gtk3 gtk3
libappindicator libappindicator
webkitgtk webkitgtk_4_0
e2fsprogs e2fsprogs
libnotify libnotify
libgit2 libgit2

4
pkgs/by-name/ap/apvlv/package.nix
View File

@ -20,7 +20,7 @@
poppler, poppler,
stdenv, stdenv,
testers, testers,
webkitgtk, webkitgtk_4_0,
wrapGAppsHook3, wrapGAppsHook3,
}: }:
@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
libxshmfence # otherwise warnings in compilation libxshmfence # otherwise warnings in compilation
pcre pcre
poppler poppler
webkitgtk webkitgtk_4_0
]; ];
installPhase = '' installPhase = ''

4
pkgs/by-name/aw/aws-workspaces/package.nix
View File

@ -11,7 +11,7 @@
, gtk3 , gtk3
, openssl_1_1 , openssl_1_1
, icu70 , icu70
, webkitgtk , webkitgtk_4_0
, librsvg , librsvg
, gdk-pixbuf , gdk-pixbuf
, libsoup , libsoup
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
gtk3 gtk3
openssl_1_1.out openssl_1_1.out
icu70 icu70
webkitgtk webkitgtk_4_0
librsvg librsvg
gdk-pixbuf gdk-pixbuf
libsoup libsoup

4
pkgs/by-name/ca/cargo-tauri/package.nix
View File

@ -9,7 +9,7 @@
libsoup, libsoup,
openssl, openssl,
pkg-config, pkg-config,
webkitgtk, webkitgtk_4_0,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3 gtk3
libsoup libsoup
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin ( ++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

4
pkgs/by-name/ca/cargo-tauri/test-app.nix
View File

@ -8,7 +8,7 @@
libsoup, libsoup,
openssl, openssl,
pkg-config, pkg-config,
webkitgtk, webkitgtk_4_0,
wrapGAppsHook3, wrapGAppsHook3,
}: }:
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.isLinux [ ++ lib.optionals stdenv.isLinux [
glib-networking glib-networking
libsoup libsoup
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals stdenv.isDarwin ( ++ lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

4
pkgs/by-name/ca/catppuccinifier-gui/package.nix
View File

@ -11,7 +11,7 @@
libsoup, libsoup,
fetchzip, fetchzip,
openssl_3, openssl_3,
webkitgtk, webkitgtk_4_0,
gdk-pixbuf, gdk-pixbuf,
pkg-config, pkg-config,
makeDesktopItem, makeDesktopItem,
@ -39,7 +39,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
curl curl
wget wget
webkitgtk webkitgtk_4_0
gtk3 gtk3
cairo cairo
gdk-pixbuf gdk-pixbuf

4
pkgs/by-name/ch/chow-kick/package.nix
View File

@ -32,7 +32,7 @@
, sqlite , sqlite
, stdenv , stdenv
, util-linuxMinimal , util-linuxMinimal
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
python3 python3
sqlite sqlite
util-linuxMinimal util-linuxMinimal
webkitgtk webkitgtk_4_0
]; ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/by-name/ch/chow-tape-model/package.nix
View File

@ -32,7 +32,7 @@
, python3 , python3
, sqlite , sqlite
, gcc11Stdenv , gcc11Stdenv
, webkitgtk , webkitgtk_4_0
}: }:
let let
# JUCE version in submodules is incompatible with GCC12 # JUCE version in submodules is incompatible with GCC12
@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
pcre2 pcre2
python3 python3
sqlite sqlite
webkitgtk webkitgtk_4_0
]; ];
# Link-time-optimization fails without these # Link-time-optimization fails without these

4
pkgs/by-name/ci/cinny-desktop/package.nix
View File

@ -14,7 +14,7 @@
glib, glib,
glib-networking, glib-networking,
libayatana-appindicator, libayatana-appindicator,
webkitgtk, webkitgtk_4_0,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -84,7 +84,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
libayatana-appindicator libayatana-appindicator
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.DarwinTools darwin.DarwinTools

4
pkgs/by-name/cl/clash-verge-rev/service.nix
View File

@ -5,7 +5,7 @@
pkg-config, pkg-config,
openssl, openssl,
pname, pname,
webkitgtk, webkitgtk_4_0,
service-cargo-hash, service-cargo-hash,
meta, meta,
}: }:
@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
buildInputs = [ buildInputs = [
openssl openssl
webkitgtk webkitgtk_4_0
]; ];
env = { env = {

4
pkgs/by-name/cl/clash-verge-rev/unwrapped.nix
View File

@ -9,7 +9,7 @@
rustPlatform, rustPlatform,
makeDesktopItem, makeDesktopItem,
meta, meta,
webkitgtk, webkitgtk_4_0,
openssl, openssl,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
@ -44,7 +44,7 @@ rustPlatform.buildRustPackage {
buildInputs = [ buildInputs = [
openssl openssl
webkitgtk webkitgtk_4_0
]; ];
postInstall = '' postInstall = ''

4
pkgs/by-name/db/dbeaver-bin/package.nix
View File

@ -11,7 +11,7 @@
gtk3, gtk3,
swt, swt,
glib, glib,
webkitgtk, webkitgtk_4_0,
glib-networking, glib-networking,
}: }:
@ -72,7 +72,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
swt swt
gtk3 gtk3
glib glib
webkitgtk webkitgtk_4_0
glib-networking glib-networking
] ]
}" }"

4
pkgs/by-name/de/desktop-postflop/package.nix
View File

@ -7,7 +7,7 @@
, pkg-config , pkg-config
, gtk3 , gtk3
, libsoup , libsoup
, webkitgtk , webkitgtk_4_0
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
libsoup libsoup
webkitgtk webkitgtk_4_0
]; ];
postInstall = '' postInstall = ''

4
pkgs/by-name/do/dorion/package.nix
View File

@ -7,7 +7,7 @@
, gst_all_1 , gst_all_1
, libappindicator , libappindicator
, libayatana-appindicator , libayatana-appindicator
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
}: }:
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-good
webkitgtk webkitgtk_4_0
]; ];
installPhase = '' installPhase = ''

4
pkgs/by-name/en/en-croissant/package.nix
View File

@ -14,7 +14,7 @@
openssl, openssl,
libsoup, libsoup,
webkitgtk, webkitgtk_4_0,
gst_all_1, gst_all_1,
darwin, darwin,
}: }:
@ -66,7 +66,7 @@ buildRustPackage rec {
lib.optionals stdenv.hostPlatform.isLinux [ lib.optionals stdenv.hostPlatform.isLinux [
openssl openssl
libsoup libsoup
webkitgtk webkitgtk_4_0
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad

4
pkgs/by-name/en/ente-auth/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
flutter324, flutter324,
fetchFromGitHub, fetchFromGitHub,
webkitgtk, webkitgtk_4_0,
sqlite, sqlite,
libayatana-appindicator, libayatana-appindicator,
makeDesktopItem, makeDesktopItem,
@ -52,7 +52,7 @@ flutter324.buildFlutterApplication rec {
]; ];
buildInputs = [ buildInputs = [
webkitgtk webkitgtk_4_0
sqlite sqlite
libayatana-appindicator libayatana-appindicator
]; ];

6
pkgs/by-name/fo/font-manager/package.nix
View File

@ -20,7 +20,7 @@
, wrapGAppsHook4 , wrapGAppsHook4
, gobject-introspection , gobject-introspection
# withWebkit enables the "webkit" feature, also known as Google Fonts # 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 { stdenv.mkDerivation rec {
@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
adwaita-icon-theme adwaita-icon-theme
] ++ lib.optionals withWebkit [ ] ++ lib.optionals withWebkit [
glib-networking # for SSL so that Google Fonts can load glib-networking # for SSL so that Google Fonts can load
libsoup libsoup_3
webkitgtk webkitgtk_6_0
]; ];
mesonFlags = [ mesonFlags = [

4
pkgs/by-name/gi/gitbutler/package.nix
View File

@ -19,7 +19,7 @@
moreutils, moreutils,
openssl, openssl,
rust, rust,
webkitgtk, webkitgtk_4_0,
nix-update-script, nix-update-script,
cacert, cacert,
}: }:
@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
glib-networking glib-networking
libsoup libsoup
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin ( ++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

4
pkgs/by-name/gn/gnome-notes/package.nix
View File

@ -19,7 +19,7 @@
libuuid, libuuid,
curl, curl,
libhandy, libhandy,
webkitgtk, webkitgtk_4_0,
gnome, gnome,
adwaita-icon-theme, adwaita-icon-theme,
libxml2, libxml2,
@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
libuuid libuuid
curl curl
libhandy libhandy
webkitgtk webkitgtk_4_0
tracker tracker
gnome-online-accounts gnome-online-accounts
gsettings-desktop-schemas gsettings-desktop-schemas

4
pkgs/by-name/gn/gnucash/package.nix
View File

@ -22,7 +22,7 @@
, perlPackages , perlPackages
, pkg-config , pkg-config
, swig , swig
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
}: }:
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
libxml2 libxml2
libxslt libxslt
swig swig
webkitgtk webkitgtk_4_0
] ]
++ (with perlPackages; [ ++ (with perlPackages; [
JSONParse JSONParse

4
pkgs/by-name/gp/gpauth/package.nix
View File

@ -6,7 +6,7 @@
openssl, openssl,
pkg-config, pkg-config,
perl, perl,
webkitgtk, webkitgtk_4_0,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
libsoup libsoup
openssl openssl
webkitgtk webkitgtk_4_0
]; ];
meta = with lib; { meta = with lib; {

4
pkgs/by-name/he/headphones-toolbox/package.nix
View File

@ -3,7 +3,7 @@
, dpkg , dpkg
, fetchurl , fetchurl
, autoPatchelfHook , autoPatchelfHook
, webkitgtk , webkitgtk_4_0
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ buildInputs = [
webkitgtk webkitgtk_4_0
]; ];
installPhase = '' installPhase = ''

4
pkgs/by-name/in/intune-portal/package.nix
View File

@ -7,7 +7,7 @@
, curlMinimal , curlMinimal
, openssl , openssl
, libsecret , libsecret
, webkitgtk , webkitgtk_4_0
, libsoup , libsoup
, gtk3 , gtk3
, atk , atk
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
curlMinimal curlMinimal
openssl openssl
libsecret libsecret
webkitgtk webkitgtk_4_0
libsoup libsoup
gtk3 gtk3
atk atk

4
pkgs/by-name/ki/kiwitalk/package.nix
View File

@ -8,7 +8,7 @@
, desktop-file-utils , desktop-file-utils
, openssl , openssl
, libayatana-appindicator , libayatana-appindicator
, webkitgtk , webkitgtk_4_0
, pkg-config , pkg-config
, pnpm , pnpm
, nodejs , nodejs
@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ buildInputs = [
openssl openssl
libayatana-appindicator libayatana-appindicator
webkitgtk webkitgtk_4_0
]; ];
postInstall = lib.optionalString stdenv.isLinux '' postInstall = lib.optionalString stdenv.isLinux ''

4
pkgs/by-name/lr/lrcget/package.nix
View File

@ -2,7 +2,7 @@
dbus, dbus,
openssl, openssl,
gtk3, gtk3,
webkitgtk, webkitgtk_4_0,
pkg-config, pkg-config,
wrapGAppsHook3, wrapGAppsHook3,
fetchFromGitHub, fetchFromGitHub,
@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec {
gtk3 gtk3
] ]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
webkitgtk webkitgtk_4_0
alsa-lib alsa-lib
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [

4
pkgs/by-name/mi/mihomo-party/package.nix
View File

@ -9,7 +9,7 @@
nspr, nspr,
alsa-lib, alsa-lib,
openssl, openssl,
webkitgtk, webkitgtk_4_0,
udev, udev,
libayatana-appindicator, libayatana-appindicator,
libGL, libGL,
@ -36,7 +36,7 @@ stdenv.mkDerivation {
nspr nspr
alsa-lib alsa-lib
openssl openssl
webkitgtk webkitgtk_4_0
stdenv.cc.cc.lib stdenv.cc.cc.lib
]; ];

4
pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
View File

@ -19,7 +19,7 @@
nodejs, nodejs,
openssl, openssl,
pkg-config, pkg-config,
webkitgtk, webkitgtk_4_0,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "modrinth-app-unwrapped"; pname = "modrinth-app-unwrapped";
@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
[ openssl ] [ openssl ]
++ lib.optionals stdenv.hostPlatform.isLinux [ ++ lib.optionals stdenv.hostPlatform.isLinux [
libsoup libsoup
webkitgtk webkitgtk_4_0
] ]
++ lib.optionals stdenv.hostPlatform.isDarwin ( ++ lib.optionals stdenv.hostPlatform.isDarwin (
with darwin.apple_sdk.frameworks; with darwin.apple_sdk.frameworks;

4
pkgs/by-name/mo/mouse-actions-gui/package.nix
View File

@ -18,7 +18,7 @@
libevdev, libevdev,
gtk3, gtk3,
libsoup, libsoup,
webkitgtk, webkitgtk_4_0,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
# Tauri deps # Tauri deps
gtk3 gtk3
libsoup libsoup
webkitgtk webkitgtk_4_0
]; ];
npmDeps = fetchNpmDeps { npmDeps = fetchNpmDeps {

4
pkgs/by-name/oi/oidc-agent/package.nix
View File

@ -3,7 +3,7 @@
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
curl, curl,
webkitgtk, webkitgtk_4_0,
libmicrohttpd, libmicrohttpd,
libsecret, libsecret,
qrencode, qrencode,
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
webkitgtk webkitgtk_4_0
libmicrohttpd libmicrohttpd
libsecret libsecret
qrencode qrencode

4
pkgs/by-name/ov/overlayed/package.nix
View File

@ -5,7 +5,7 @@
pkg-config, pkg-config,
openssl, openssl,
libsoup, libsoup,
webkitgtk, webkitgtk_4_0,
fetchFromGitHub, fetchFromGitHub,
libayatana-appindicator, libayatana-appindicator,
}: }:
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ buildInputs = [
openssl openssl
webkitgtk webkitgtk_4_0
libsoup libsoup
]; ];

4
pkgs/by-name/po/portfolio/package.nix
View File

@ -10,7 +10,7 @@
openjdk17, openjdk17,
stdenvNoCC, stdenvNoCC,
swt, swt,
webkitgtk, webkitgtk_4_0,
wrapGAppsHook3, wrapGAppsHook3,
gitUpdater, gitUpdater,
}: }:
@ -30,7 +30,7 @@ let
gtk3 gtk3
libsecret libsecret
swt swt
webkitgtk webkitgtk_4_0
]; ];
in in
stdenvNoCC.mkDerivation (finalAttrs: { stdenvNoCC.mkDerivation (finalAttrs: {

4
pkgs/by-name/po/pot/package.nix
View File

@ -14,7 +14,7 @@
buildGoModule, buildGoModule,
libayatana-appindicator, libayatana-appindicator,
gtk3, gtk3,
webkitgtk, webkitgtk_4_0,
libsoup, libsoup,
openssl, openssl,
xdotool, xdotool,
@ -72,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
libsoup libsoup
libayatana-appindicator libayatana-appindicator
openssl openssl
webkitgtk webkitgtk_4_0
xdotool xdotool
]; ];

4
pkgs/by-name/sn/snippetexpandergui/package.nix
View File

@ -6,7 +6,7 @@
, installShellFiles , installShellFiles
, xorg , xorg
, gtk3 , gtk3
, webkitgtk , webkitgtk_4_0
, snippetexpanderd , snippetexpanderd
, snippetexpanderx , snippetexpanderx
}: }:
@ -32,7 +32,7 @@ buildGoModule rec {
buildInputs = [ buildInputs = [
xorg.libX11 xorg.libX11
gtk3 gtk3
webkitgtk webkitgtk_4_0
snippetexpanderd snippetexpanderd
snippetexpanderx snippetexpanderx
]; ];

4
pkgs/by-name/sq/squirreldisk/package.nix
View File

@ -4,7 +4,7 @@
freetype, freetype,
libsoup, libsoup,
gtk3, gtk3,
webkitgtk, webkitgtk_4_0,
pkg-config, pkg-config,
wrapGAppsHook3, wrapGAppsHook3,
parallel-disk-usage, parallel-disk-usage,
@ -66,7 +66,7 @@ in
''; '';
nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; 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 # Disable checkPhase, since the project doesn't contain tests
doCheck = false; doCheck = false;

4
pkgs/by-name/tr/treedome/package.nix
View File

@ -15,7 +15,7 @@
, openssl , openssl
, pkg-config , pkg-config
, rustPlatform , rustPlatform
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, sqlite , sqlite
}: }:
@ -97,7 +97,7 @@ rustPlatform.buildRustPackage {
freetype freetype
libsoup libsoup
gtk3 gtk3
webkitgtk webkitgtk_4_0
gsettings-desktop-schemas gsettings-desktop-schemas
sqlite sqlite
]; ];

4
pkgs/by-name/xi/xiphos/package.nix
View File

@ -22,7 +22,7 @@
, minizip , minizip
, pkg-config , pkg-config
, sword , sword
, webkitgtk , webkitgtk_4_0
, wrapGAppsHook3 , wrapGAppsHook3
, yelp-tools , yelp-tools
, zip , zip
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
libuuid libuuid
minizip minizip
sword sword
webkitgtk webkitgtk_4_0
]; ];
cmakeFlags = [ cmakeFlags = [

2
pkgs/development/compilers/chicken/5/overrides.nix
View File

@ -139,7 +139,7 @@ in
addToNativeBuildInputs pkgs.taglib old addToNativeBuildInputs pkgs.taglib old
); );
uuid-lib = addToBuildInputs pkgs.libuuid; uuid-lib = addToBuildInputs pkgs.libuuid;
webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk; webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0;
ws-client = addToBuildInputs pkgs.zlib; ws-client = addToBuildInputs pkgs.zlib;
xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;
yaml = addToBuildInputs pkgs.libyaml; yaml = addToBuildInputs pkgs.libyaml;

54
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -124113,7 +124113,7 @@ self: {
"gi-javascriptcore" = callPackage "gi-javascriptcore" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
, gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
, text, transformers, webkitgtk , text, transformers, webkitgtk_4_0
}: }:
mkDerivation { mkDerivation {
pname = "gi-javascriptcore"; pname = "gi-javascriptcore";
@ -124124,11 +124124,11 @@ self: {
base bytestring containers gi-glib gi-gobject haskell-gi base bytestring containers gi-glib gi-gobject haskell-gi
haskell-gi-base haskell-gi-overloading text transformers haskell-gi-base haskell-gi-overloading text transformers
]; ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "JavaScriptCore bindings"; description = "JavaScriptCore bindings";
license = lib.licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
badPlatforms = lib.platforms.darwin; badPlatforms = lib.platforms.darwin;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"gi-javascriptcore_6_0_4" = callPackage "gi-javascriptcore_6_0_4" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-glib ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@ -124469,7 +124469,7 @@ self: {
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
, haskell-gi-overloading, text, transformers, webkitgtk , haskell-gi-overloading, text, transformers, webkitgtk_4_0
}: }:
mkDerivation { mkDerivation {
pname = "gi-webkit"; pname = "gi-webkit";
@ -124484,17 +124484,17 @@ self: {
gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
haskell-gi-base haskell-gi-overloading text transformers haskell-gi-base haskell-gi-overloading text transformers
]; ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "WebKit bindings"; description = "WebKit bindings";
license = lib.licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"gi-webkit2" = callPackage "gi-webkit2" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-atk ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
, gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk
, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
, haskell-gi-overloading, text, transformers, webkitgtk , haskell-gi-overloading, text, transformers, webkitgtk_4_0
}: }:
mkDerivation { mkDerivation {
pname = "gi-webkit2"; pname = "gi-webkit2";
@ -124509,17 +124509,17 @@ self: {
gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
haskell-gi-base haskell-gi-overloading text transformers haskell-gi-base haskell-gi-overloading text transformers
]; ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "WebKit2 bindings"; description = "WebKit2 bindings";
license = lib.licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
badPlatforms = lib.platforms.darwin; badPlatforms = lib.platforms.darwin;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"gi-webkit2webextension" = callPackage "gi-webkit2webextension" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
, gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup , gi-gio, gi-gobject, gi-gtk, gi-javascriptcore, gi-soup
, haskell-gi, haskell-gi-base, haskell-gi-overloading, text , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
, transformers, webkitgtk , transformers, webkitgtk_4_0
}: }:
mkDerivation { mkDerivation {
pname = "gi-webkit2webextension"; pname = "gi-webkit2webextension";
@ -124534,13 +124534,13 @@ self: {
gi-javascriptcore gi-soup haskell-gi haskell-gi-base gi-javascriptcore gi-soup haskell-gi haskell-gi-base
haskell-gi-overloading text transformers haskell-gi-overloading text transformers
]; ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "WebKit2-WebExtension bindings"; description = "WebKit2-WebExtension bindings";
license = lib.licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
badPlatforms = lib.platforms.darwin; badPlatforms = lib.platforms.darwin;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"gi-webkitwebprocessextension" = callPackage "gi-webkitwebprocessextension" = callPackage
({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
@ -309518,7 +309518,7 @@ self: {
, gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
, mime-types, mtl, network, process, random, scientific, split , mime-types, mtl, network, process, random, scientific, split
, tasty, tasty-quickcheck, text, transformers, unordered-containers , 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 , xmonad-contrib
}: }:
mkDerivation { mkDerivation {
@ -309537,7 +309537,7 @@ self: {
mime-types mtl network process random scientific split text mime-types mtl network process random scientific split text
transformers unordered-containers utf8-string vector xdg-basedir transformers unordered-containers utf8-string vector xdg-basedir
]; ];
executablePkgconfigDepends = [ gtk3 webkitgtk ]; executablePkgconfigDepends = [ gtk3 webkitgtk_4_0 ];
testHaskellDepends = [ testHaskellDepends = [
aeson base bytestring containers dbus directory filepath gi-gdk aeson base bytestring containers dbus directory filepath gi-gdk
gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@ -309550,7 +309550,7 @@ self: {
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
mainProgram = "tianbar"; mainProgram = "tianbar";
broken = true; broken = true;
}) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) gtk3; inherit (pkgs) webkitgtk_4_0;};
"tibetan-utils" = callPackage "tibetan-utils" = callPackage
({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec ({ mkDerivation, base, composition-prelude, hspec, hspec-megaparsec
@ -332056,30 +332056,30 @@ self: {
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkit ]; libraryPkgconfigDepends = [ webkit ];
description = "JavaScriptCore FFI from webkitgtk"; description = "JavaScriptCore FFI from webkitgtk_4_0";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
broken = true; broken = true;
}) {webkit = null;}; }) {webkit = null;};
"webkit2gtk3-javascriptcore" = callPackage "webkit2gtk3-javascriptcore" = callPackage
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
mkDerivation { mkDerivation {
pname = "webkit2gtk3-javascriptcore"; pname = "webkit2gtk3-javascriptcore";
version = "0.14.4.6"; version = "0.14.4.6";
sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24"; sha256 = "06g9ik2pzv761bj5kas17jxh6wxks3dd4vvrimliybs5s5b61b24";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "JavaScriptCore FFI from webkitgtk"; description = "JavaScriptCore FFI from webkitgtk_4_0";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin; badPlatforms = lib.platforms.darwin;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"webkitgtk3" = callPackage "webkitgtk3" = callPackage
({ mkDerivation, base, bytestring, Cabal, cairo, glib ({ mkDerivation, base, bytestring, Cabal, cairo, glib
, gtk2hs-buildtools, gtk3, mtl, pango, text, transformers , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
, webkitgtk , webkitgtk_4_0
}: }:
mkDerivation { mkDerivation {
pname = "webkitgtk3"; pname = "webkitgtk3";
@ -332090,27 +332090,27 @@ self: {
libraryHaskellDepends = [ libraryHaskellDepends = [
base bytestring cairo glib gtk3 mtl pango text transformers base bytestring cairo glib gtk3 mtl pango text transformers
]; ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
libraryToolDepends = [ gtk2hs-buildtools ]; libraryToolDepends = [ gtk2hs-buildtools ];
description = "Binding to the Webkit library"; description = "Binding to the Webkit library";
license = lib.licenses.lgpl21Only; license = lib.licenses.lgpl21Only;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
broken = true; broken = true;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"webkitgtk3-javascriptcore" = callPackage "webkitgtk3-javascriptcore" = callPackage
({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }: ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk_4_0 }:
mkDerivation { mkDerivation {
pname = "webkitgtk3-javascriptcore"; pname = "webkitgtk3-javascriptcore";
version = "0.14.2.1"; version = "0.14.2.1";
sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j"; sha256 = "0kcjrka0c9ifq3zfhmkv05wy3xb7v0cyznfxldp2gjcn1haq084j";
setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
libraryHaskellDepends = [ base ]; libraryHaskellDepends = [ base ];
libraryPkgconfigDepends = [ webkitgtk ]; libraryPkgconfigDepends = [ webkitgtk_4_0 ];
description = "JavaScriptCore FFI from webkitgtk"; description = "JavaScriptCore FFI from webkitgtk_4_0";
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none; hydraPlatforms = lib.platforms.none;
}) {inherit (pkgs) webkitgtk;}; }) {inherit (pkgs) webkitgtk_4_0;};
"webmention" = callPackage "webmention" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, either ({ mkDerivation, base, bytestring, case-insensitive, either

4
pkgs/development/libraries/rnnoise-plugin/default.nix
View File

@ -6,7 +6,7 @@
, gtk3-x11 , gtk3-x11
, pcre , pcre
, pkg-config , pkg-config
, webkitgtk , webkitgtk_4_0
, xorg , xorg
, WebKit , WebKit
, MetalKit , MetalKit
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
xorg.libX11 xorg.libX11
xorg.libXrandr xorg.libXrandr
] ++ lib.optionals stdenv.hostPlatform.isLinux [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
webkitgtk webkitgtk_4_0
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
WebKit WebKit
MetalKit MetalKit

4
pkgs/development/libraries/wxwidgets/wxGTK31.nix
View File

@ -20,7 +20,7 @@
, withEGL ? true , withEGL ? true
, withMesa ? !stdenv.hostPlatform.isDarwin , withMesa ? !stdenv.hostPlatform.isDarwin
, withWebKit ? stdenv.hostPlatform.isDarwin , withWebKit ? stdenv.hostPlatform.isDarwin
, webkitgtk , webkitgtk_4_0
, setfile , setfile
, AGL , AGL
, Carbon , Carbon
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optional withCurl curl ++ lib.optional withCurl curl
++ lib.optional withMesa libGLU ++ 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.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
setfile setfile

4
pkgs/development/libraries/wxwidgets/wxGTK32.nix
View File

@ -22,7 +22,7 @@
, unicode ? true , unicode ? true
, withMesa ? !stdenv.hostPlatform.isDarwin , withMesa ? !stdenv.hostPlatform.isDarwin
, withWebKit ? true , withWebKit ? true
, webkitgtk , webkitgtk_4_0
, setfile , setfile
, AGL , AGL
, Carbon , Carbon
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
xorgproto xorgproto
] ]
++ lib.optional withMesa libGLU ++ 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.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit
++ lib.optionals stdenv.hostPlatform.isDarwin [ ++ lib.optionals stdenv.hostPlatform.isDarwin [
expat expat

2
pkgs/development/lisp-modules/ql.nix
View File

@ -65,7 +65,7 @@ let
nativeLibs = [ pkgs.sqlite ]; nativeLibs = [ pkgs.sqlite ];
}); });
cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: { cl-webkit2 = super.cl-webkit2.overrideLispAttrs (o: {
nativeLibs = [ pkgs.webkitgtk ]; nativeLibs = [ pkgs.webkitgtk_4_0 ];
}); });
dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: { dbd-mysql = super.dbd-mysql.overrideLispAttrs (o: {
nativeLibs = [ pkgs.mariadb.client ]; nativeLibs = [ pkgs.mariadb.client ];

4
pkgs/development/misc/juce/default.nix
View File

@ -13,7 +13,7 @@
, freetype , freetype
, curl , curl
, libglvnd , libglvnd
, webkitgtk , webkitgtk_4_0
, pcre , pcre
, darwin , darwin
}: }:
@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
] ++ lib.optionals stdenv.hostPlatform.isLinux [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so alsa-lib # libasound.so
libglvnd # libGL.so libglvnd # libGL.so
webkitgtk # webkit2gtk-4.0 webkitgtk_4_0 # webkit2gtk-4.0
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa
darwin.apple_sdk.frameworks.MetalKit darwin.apple_sdk.frameworks.MetalKit

4
pkgs/development/python-modules/wxpython/4.2.nix
View File

@ -30,7 +30,7 @@
mesa, mesa,
pango, pango,
SDL, SDL,
webkitgtk, webkitgtk_4_0,
wxGTK, wxGTK,
xorgproto, xorgproto,
@ -93,7 +93,7 @@ buildPythonPackage rec {
libXxf86vm libXxf86vm
libglvnd libglvnd
mesa mesa
webkitgtk webkitgtk_4_0
xorgproto xorgproto
]; ];

4
pkgs/development/tools/devpod/default.nix
View File

@ -18,7 +18,7 @@
, rustPlatform , rustPlatform
, stdenv , stdenv
, testers , testers
, webkitgtk , webkitgtk_4_0
}: }:
let let
@ -146,7 +146,7 @@ rec {
] ++ lib.optionals stdenv.hostPlatform.isLinux [ ] ++ lib.optionals stdenv.hostPlatform.isLinux [
gtk3 gtk3
libayatana-appindicator libayatana-appindicator
webkitgtk webkitgtk_4_0
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Carbon
darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Cocoa

6
pkgs/development/tools/eclipse-mat/default.nix
View File

@ -14,7 +14,7 @@
, shared-mime-info , shared-mime-info
, stdenv , stdenv
, unzip , unzip
, webkitgtk , webkitgtk_4_0
, zlib , zlib
}: }:
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
# Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version> # Create wrapper script. Pass -configuration to store settings in ~/.eclipse-mat/<version>
makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \ makeWrapper $out/mat/MemoryAnalyzer $out/bin/eclipse-mat \
--prefix PATH : ${jdk}/bin \ --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" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration" --add-flags "-configuration \$HOME/.eclipse-mat/''${version}/configuration"
@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
libXtst libXtst
zlib zlib
shared-mime-info shared-mime-info
webkitgtk webkitgtk_4_0
]; ];
dontBuild = true; dontBuild = true;

Some files were not shown because too many files have changed in this diff Show More