movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 19:13:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: update to webkitgtk_4_1 where possible

Browse source 
Methodology:
- `sed` to find and replace in pkgs/*
- exclude pkgs/top-level
- nixpkgs-review on x86_64-linux and aarch64-linux
- revert everything that doesn't build
- revert everything that doesn't launch [x86_64-linux]
- check upstream source whether the change makes sense [free software only]
This commit is contained in:
Grimmauld 2025-04-15 23:58:33 +02:00 • committed by Alyssa Ross
parent 96f6f921c2
commit cd062f040e
31 changed files with 62 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@
libXtst,
libsecret,
gsettings-desktop-schemas,
webkitgtk_4_0,
webkitgtk_4_1,
makeWrapper,
perl,
...
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
libXtst
libsecret
zlib
] ++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0;
] ++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1;
buildCommand = ''
# Unpack tarball.
@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
libXtst
libsecret
]
++ lib.optional (webkitgtk_4_0 != null) webkitgtk_4_0
++ lib.optional (webkitgtk_4_1 != null) webkitgtk_4_1
)
} \
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \

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

@ -16,7 +16,7 @@
jdk,
jdk8,
gsettings-desktop-schemas,
webkitgtk_4_0 ? null, # for internal web browser
webkitgtk_4_1 ? null, # for internal web browser
buildEnv,
runCommand,
callPackage,
@ -64,7 +64,7 @@ let
gtk
libXtst
gsettings-desktop-schemas
webkitgtk_4_0
webkitgtk_4_1
makeWrapper
;
};

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

@ -10,7 +10,7 @@
gtkspell3,
librsvg,
pygobject3,
webkitgtk_4_0,
webkitgtk_4_1,
}:
buildPythonApplication rec {
@ -37,7 +37,7 @@ buildPythonApplication rec {
gtkspell3
librsvg
pygobject3
webkitgtk_4_0
webkitgtk_4_1
];
# Needs a display

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

@ -8,7 +8,7 @@
gtk3,
gtksourceview,
pango,
webkitgtk_4_0,
webkitgtk_4_1,
pygobject3,
pyyaml,
setuptools,
@ -39,7 +39,7 @@ buildPythonApplication rec {
gtk3
gtksourceview
pango
webkitgtk_4_0
webkitgtk_4_1
pygobject3
pyyaml
];

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

@ -14,7 +14,7 @@
gtk3,
libnotify,
pango,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
# check inputs
@ -96,7 +96,7 @@ buildPythonApplication rec {
gtk3
libnotify
pango
webkitgtk_4_0
webkitgtk_4_1
]
++ (with gst_all_1; [
gst-libav

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

@ -21,7 +21,7 @@ let
gtksourceview
gnome-desktop
libgnome-keyring
webkitgtk_4_0
webkitgtk_4_1
];
xorgDeps =
pkgs: with pkgs.xorg; [

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

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

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

@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
obs-studio,
webkitgtk_4_0,
webkitgtk_4_1,
glib-networking,
meson,
cmake,
@ -25,7 +25,7 @@ stdenv.mkDerivation {
buildInputs = [
obs-studio
webkitgtk_4_0
webkitgtk_4_1
glib-networking
];

4
pkgs/by-name/ap/apache-directory-studio/package.nix
View file

@ -8,7 +8,7 @@
makeDesktopItem,
glib,
libsecret,
webkitgtk_4_0,
webkitgtk_4_1,
}:
stdenv.mkDerivation rec {
@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath [
glib
webkitgtk_4_0
webkitgtk_4_1
]
} \
--run "mkdir -p /tmp/SWT-GDBusServer"

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

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

4
pkgs/by-name/ar/archi/package.nix
View file

@ -7,7 +7,7 @@
jdk,
libsecret,
glib,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
_7zz,
nixosTests,
@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath ([
glib
webkitgtk_4_0
webkitgtk_4_1
])
} \
--set WEBKIT_DISABLE_DMABUF_RENDERER 1 \

4
pkgs/by-name/be/bespokesynth/package.nix
View file

@ -28,7 +28,7 @@
xcbutilkeysyms,
xcb-util-cursor,
gtk3,
webkitgtk_4_0,
webkitgtk_4_1,
python3,
curl,
pcre,
@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
libXScrnSaver
curl
gtk3
webkitgtk_4_0
webkitgtk_4_1
freetype
libGL
libusb1

4
pkgs/by-name/bi/bitcomet/package.nix
View file

@ -2,7 +2,7 @@
lib,
fetchurl,
appimageTools,
webkitgtk_4_0,
webkitgtk_4_1,
}:
let
pname = "bitcomet";
@ -20,7 +20,7 @@ appimageTools.wrapType2 {
pkgs: with pkgs; [
libxml2
libpng
webkitgtk_4_0
webkitgtk_4_1
];
extraInstallCommands = ''

4
pkgs/by-name/cl/claws-mail/package.nix
View file

@ -55,7 +55,7 @@
enablePluginClamd ? true,
enablePluginDillo ? true,
enablePluginFancy ? true,
webkitgtk_4_0,
webkitgtk_4_1,
enablePluginFetchInfo ? true,
enablePluginKeywordWarner ? true,
enablePluginLibravatar ? enablePluginRavatar,
@ -147,7 +147,7 @@ let
{
flags = [ "fancy-plugin" ];
enabled = enablePluginFancy;
deps = [ webkitgtk_4_0 ];
deps = [ webkitgtk_4_1 ];
}
{
flags = [ "fetchinfo-plugin" ];

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

@ -10,7 +10,7 @@
wrapGAppsHook3,
gtk3,
glib,
webkitgtk_4_0,
webkitgtk_4_1,
glib-networking,
override_xmx ? "1024m",
}:
@ -83,7 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
lib.makeLibraryPath [
gtk3
glib
webkitgtk_4_0
webkitgtk_4_1
glib-networking
]
}"

6
pkgs/by-name/ec/eclipse-mat/package.nix
View file

@ -15,7 +15,7 @@
shared-mime-info,
stdenv,
unzip,
webkitgtk_4_0,
webkitgtk_4_1,
zlib,
}:
@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
glib
gtk3
libXtst
webkitgtk_4_0
webkitgtk_4_1
])
} \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
libXtst
zlib
shared-mime-info
webkitgtk_4_0
webkitgtk_4_1
];
dontBuild = true;

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

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

4
pkgs/by-name/ex/exaile/package.nix
View file

@ -16,7 +16,7 @@
librsvg,
streamripper,
udisks,
webkitgtk_4_0,
webkitgtk_4_1,
iconTheme ? adwaita-icon-theme,
deviceDetectionSupport ? true,
documentationSupport ? true,
@ -89,7 +89,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_4_0;
++ lib.optional wikipediaSupport webkitgtk_4_1;
nativeCheckInputs = with python3.pkgs; [
pytest

4
pkgs/by-name/gi/giara/package.nix
View file

@ -9,7 +9,7 @@
wrapGAppsHook4,
gtk4,
gdk-pixbuf,
webkitgtk_4_0,
webkitgtk_4_1,
gtksourceview5,
glib-networking,
libadwaita,
@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = [
gtk4
gdk-pixbuf
webkitgtk_4_0
webkitgtk_4_1
gtksourceview5
glib-networking
libadwaita

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

@ -8,7 +8,7 @@
nspr,
alsa-lib,
openssl,
webkitgtk_4_0,
webkitgtk_4_1,
udev,
libayatana-appindicator,
libGL,
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
nspr
alsa-lib
openssl
webkitgtk_4_0
webkitgtk_4_1
(lib.getLib stdenv.cc.cc)
];

4
pkgs/by-name/mi/minigalaxy/package.nix
View file

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

4
pkgs/by-name/os/osmo/package.nix
View file

@ -10,7 +10,7 @@
libnotify,
libarchive,
gspell,
webkitgtk_4_0,
webkitgtk_4_1,
libgringotts,
wrapGAppsHook3,
}:
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libnotify
libarchive
gspell
webkitgtk_4_0
webkitgtk_4_1
libgringotts
];

6
pkgs/by-name/pl/plugdata/package.nix
View file

@ -9,7 +9,7 @@
pkg-config,
alsa-lib,
freetype,
webkitgtk_4_0,
webkitgtk_4_1,
zenity,
curl,
xorg,
@ -23,7 +23,6 @@
libxkbcommon,
libdatrie,
libepoxy,
libsoup_2_4,
libGL,
libjack2,
lerc,
@ -60,7 +59,7 @@ stdenv.mkDerivation {
alsa-lib
curl
freetype
webkitgtk_4_0
webkitgtk_4_1
xorg.libX11
xorg.libXcursor
xorg.libXext
@ -80,7 +79,6 @@ stdenv.mkDerivation {
libxkbcommon
libdatrie
libepoxy
libsoup_2_4
lerc
libjack2
expat

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

@ -9,7 +9,7 @@
makeDesktopItem,
openjdk21,
stdenvNoCC,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
gitUpdater,
}:
@ -28,7 +28,7 @@ let
glib-networking
gtk3
libsecret
webkitgtk_4_0
webkitgtk_4_1
];
in
stdenvNoCC.mkDerivation (finalAttrs: {

6
pkgs/by-name/so/socalabs-sid/package.nix
View file

@ -13,7 +13,7 @@
libGL,
libjack2,
curl,
webkitgtk_4_0,
webkitgtk_4_1,
libsysprof-capture,
pcre2,
util-linux,
@ -23,7 +23,6 @@
libxkbcommon,
libdatrie,
libepoxy,
libsoup_2_4,
lerc,
sqlite,
ninja,
@ -89,11 +88,10 @@ stdenv.mkDerivation {
libxkbcommon
libdatrie
libepoxy
libsoup_2_4
lerc
freetype
curl
webkitgtk_4_0
webkitgtk_4_1
pcre2
util-linux
sqlite

4
pkgs/by-name/ul/ulauncher/package.nix
View file

@ -9,7 +9,7 @@
gobject-introspection,
gtk3,
wrapGAppsHook3,
webkitgtk_4_0,
webkitgtk_4_1,
libnotify,
keybinder3,
libappindicator,
@ -45,7 +45,7 @@ python3Packages.buildPythonApplication rec {
libappindicator
libnotify
librsvg
webkitgtk_4_0
webkitgtk_4_1
wmctrl
];

4
pkgs/by-name/wa/wasistlos/package.nix
View file

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

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

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

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

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

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

@ -13,7 +13,7 @@
freetype,
curl,
libglvnd,
webkitgtk_4_0,
webkitgtk_4_1,
pcre2,
libsysprof-capture,
util-linuxMinimal,
@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals stdenv.hostPlatform.isLinux [
alsa-lib # libasound.so
libglvnd # libGL.so
webkitgtk_4_0 # webkit2gtk-4.0
webkitgtk_4_1 # webkit2gtk-4.0
util-linuxMinimal
libselinux
libsepol

4
pkgs/tools/networking/gp-saml-gui/default.nix
View file

@ -3,7 +3,7 @@
stdenv,
fetchFromGitHub,
buildPythonPackage,
webkitgtk_4_0,
webkitgtk_4_1,
wrapGAppsHook3,
glib-networking,
gobject-introspection,
@ -34,7 +34,7 @@ buildPythonPackage rec {
requests
pygobject3
openconnect
] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_0;
] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
preFixup = ''
gappsWrapperArgs+=(