From eb04659fc2623c05643ed14633423758d3c6c6a4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 26 Apr 2024 22:24:03 +0200 Subject: treewide: wrapGAppsHook → wrapGAppsHook3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was achieved using the following command: sd 'wrapGAppsHook\b' wrapGAppsHook3 (rg -l 'wrapGAppsHook\b') And then manually reverted the following changes: - alias in top-level.nix - function name in wrap-gapps-hook.sh - comment in postFixup of at-spi2-core - comment in gtk4 - comment in preFixup of 1password-gui/linux.nix - comment in postFixup of qgis/unwrapped-ltr.nix and qgis/unwrapped.nix - comment in postFixup of telegram-desktop - comment in postFixup of fwupd - buildCommand of mongodb-compass - postFixup of xflux-gui - comment in a patch in kdePackages.kde-gtk-config and plasma5Packages.kde-gtk-config - description of programs.sway.wrapperFeatures.gtk NixOS option (manual rebuild) --- pkgs/games/doom-ports/slade/default.nix | 4 ++-- pkgs/games/freeciv/default.nix | 4 ++-- pkgs/games/gamehub/default.nix | 4 ++-- pkgs/games/gnonograms/default.nix | 4 ++-- pkgs/games/grapejuice/default.nix | 4 ++-- pkgs/games/gscrabble/default.nix | 4 ++-- pkgs/games/gshogi/default.nix | 4 ++-- pkgs/games/gweled/default.nix | 4 ++-- pkgs/games/hmcl/default.nix | 4 ++-- pkgs/games/jfsw/default.nix | 4 ++-- pkgs/games/jumpnbump/default.nix | 4 ++-- pkgs/games/liberation-circuit/default.nix | 4 ++-- pkgs/games/linthesia/default.nix | 4 ++-- pkgs/games/maptool/default.nix | 4 ++-- pkgs/games/minecraft/default.nix | 4 ++-- pkgs/games/principia/default.nix | 4 ++-- pkgs/games/runescape-launcher/default.nix | 4 ++-- pkgs/games/sgt-puzzles/default.nix | 4 ++-- pkgs/games/space-station-14-launcher/space-station-14-launcher.nix | 4 ++-- pkgs/games/vassal/default.nix | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) (limited to 'pkgs/games') diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 9ab3d1f458d5d..bae685ccac47f 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -15,7 +15,7 @@ , glew , lua , mpg123 -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pkg-config which zip - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 6f653c46df864..d1a50ea89cc19 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -2,7 +2,7 @@ , zlib, bzip2, curl, xz, gettext, libiconv, icu , SDL2, SDL2_mixer, SDL2_image, SDL2_ttf, SDL2_gfx, freetype, fluidsynth , sdl2Client ? false -, gtkClient ? true, gtk3, wrapGAppsHook +, gtkClient ? true, gtk3, wrapGAppsHook3 , qtClient ? false, qt5 , server ? true, readline , enableSqlite ? true, sqlite @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optionals qtClient [ qt5.wrapQtAppsHook ] - ++ lib.optionals gtkClient [ wrapGAppsHook ]; + ++ lib.optionals gtkClient [ wrapGAppsHook3 ]; buildInputs = [ lua5_3 zlib bzip2 curl xz gettext libiconv icu ] ++ [ SDL2 SDL2_mixer SDL2_image SDL2_ttf SDL2_gfx freetype fluidsynth ] diff --git a/pkgs/games/gamehub/default.nix b/pkgs/games/gamehub/default.nix index 87796d58c732b..3bfbe71c3c0e8 100644 --- a/pkgs/games/gamehub/default.nix +++ b/pkgs/games/gamehub/default.nix @@ -16,7 +16,7 @@ , webkitgtk , libmanette , libXtst -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 69d45e32fe26c..57f38d61bbb5a 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -9,7 +9,7 @@ , appstream , python3 , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , pantheon , libgee @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { appstream python3 shared-mime-info - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/grapejuice/default.nix b/pkgs/games/grapejuice/default.nix index c8d1956eb9a54..9c2c8a594388b 100644 --- a/pkgs/games/grapejuice/default.nix +++ b/pkgs/games/grapejuice/default.nix @@ -4,7 +4,7 @@ , pciutils , python3Packages , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glib , cairo , desktop-file-utils @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { gobject-introspection desktop-file-utils glib - wrapGAppsHook + wrapGAppsHook3 python3Packages.pip ]; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 28e2a58b0d008..453cbfedba949 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub -, gtk3, wrapGAppsHook, gst_all_1, gobject-introspection +, gtk3, wrapGAppsHook3, gst_all_1, gobject-introspection , python3Packages, gnome }: buildPythonApplication { @@ -15,7 +15,7 @@ buildPythonApplication { doCheck = false; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index 350ab86aa22b3..a4e9b903dc1cd 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index 484543ad86592..b27da3b2f7c4e 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, gettext -, gtk2, wrapGAppsHook, autoreconfHook, pkg-config +, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" ''; - nativeBuildInputs = [ wrapGAppsHook gettext autoreconfHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/pkgs/games/hmcl/default.nix b/pkgs/games/hmcl/default.nix index 95a40f0a8d809..2dd9c7b7884e5 100644 --- a/pkgs/games/hmcl/default.nix +++ b/pkgs/games/hmcl/default.nix @@ -3,7 +3,7 @@ , fetchurl , makeBinaryWrapper , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems , imagemagick , jre @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeBinaryWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems imagemagick ]; diff --git a/pkgs/games/jfsw/default.nix b/pkgs/games/jfsw/default.nix index 9b631551b5790..ed82964e4d0eb 100644 --- a/pkgs/games/jfsw/default.nix +++ b/pkgs/games/jfsw/default.nix @@ -5,7 +5,7 @@ , SDL2 , perl , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 perl pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/jumpnbump/default.nix b/pkgs/games/jumpnbump/default.nix index 193d4dc0b585f..b2f6a646c65f3 100644 --- a/pkgs/games/jumpnbump/default.nix +++ b/pkgs/games/jumpnbump/default.nix @@ -4,7 +4,7 @@ , SDL2, SDL2_mixer, SDL2_net , gtk3, gobject-introspection , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: let data = fetchzip { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 gobject-introspection ]; buildInputs = [ SDL2 SDL2_mixer SDL2_net gtk3 ]; postInstall = '' diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index 5df48282f26d4..cfae4282a04a3 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook }: +{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, allegro5, libGL, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "liberation-circuit"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ allegro5 libGL ]; dontWrapGApps = true; diff --git a/pkgs/games/linthesia/default.nix b/pkgs/games/linthesia/default.nix index 1200afa4f2f71..e918906af4f38 100644 --- a/pkgs/games/linthesia/default.nix +++ b/pkgs/games/linthesia/default.nix @@ -14,7 +14,7 @@ , python3 , sqlite , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patchShebangs meson_post_install.py ''; - nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config python3 wrapGAppsHook3 ]; buildInputs = [ libGL libGLU diff --git a/pkgs/games/maptool/default.nix b/pkgs/games/maptool/default.nix index 1e95e376825c6..775879a957ad3 100644 --- a/pkgs/games/maptool/default.nix +++ b/pkgs/games/maptool/default.nix @@ -8,7 +8,7 @@ , makeDesktopItem , openjfx , stdenvNoCC -, wrapGAppsHook +, wrapGAppsHook3 }: let pname = "maptool"; @@ -82,7 +82,7 @@ stdenvNoCC.mkDerivation { nativeBuildInputs = [ copyDesktopItems libarchive - wrapGAppsHook + wrapGAppsHook3 ]; desktopItems = [ diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index c9ce3bfb17f16..eb05e085f1496 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , jre # old or modded versions of the game may require Java 8 (https://aur.archlinux.org/packages/minecraft-launcher/#pinned-674960) , xorg @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { sha256 = "0w8z21ml79kblv20wh5lz037g130pxkgs8ll9s3bi94zn2pbrhim"; }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook copyDesktopItems gobject-introspection ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 copyDesktopItems gobject-introspection ]; sourceRoot = "."; diff --git a/pkgs/games/principia/default.nix b/pkgs/games/principia/default.nix index e97fc509c5b0a..0cf659e448e0e 100644 --- a/pkgs/games/principia/default.nix +++ b/pkgs/games/principia/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , curl , freetype @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 062a194c83dcc..6bed4908f471f 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -18,7 +18,7 @@ , openssl_1_1 , pango , SDL2 -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg , xorg_sys_opengl @@ -40,7 +40,7 @@ let nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index e5be3c4ae71ed..304c0f9b27c78 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick -, pkg-config, perl, wrapGAppsHook, nixosTests, writeScript +, pkg-config, perl, wrapGAppsHook3, nixosTests, writeScript , isMobile ? false }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { imagemagick perl pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; env.NIX_CFLAGS_COMPILE = lib.optionalString isMobile "-DSTYLUS_BASED"; diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix index 6403602b79c53..bbd9324a250e1 100644 --- a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -2,7 +2,7 @@ , buildDotnetModule , dotnetCorePackages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , iconConvTools , copyDesktopItems , makeDesktopItem @@ -73,7 +73,7 @@ buildDotnetModule rec { "-nologo" ]; - nativeBuildInputs = [ wrapGAppsHook iconConvTools copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 iconConvTools copyDesktopItems ]; runtimeDeps = [ # Required by the game. diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 31996a30c1fe6..e2c1d4037b3f9 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -4,7 +4,7 @@ , glib , jre , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; installPhase = '' -- cgit 1.4.1