diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-04-26 22:24:03 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-04-27 02:23:22 +0200 |
| commit | eb04659fc2623c05643ed14633423758d3c6c6a4 (patch) | |
| tree | 6ee1df69158b4ed56241c051d84e5b0bd2c74e12 /pkgs/by-name | |
| parent | 37383113cc1df4b1441e0d8b38bac5357f94f6be (diff) | |
treewide: wrapGAppsHook → wrapGAppsHook3
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)
Diffstat (limited to 'pkgs/by-name')
85 files changed, 169 insertions, 169 deletions
diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix index 6c68fff2bb630..cdec1259fd08b 100644 --- a/pkgs/by-name/ae/aegisub/package.nix +++ b/pkgs/by-name/ae/aegisub/package.nix @@ -33,7 +33,7 @@ portaudio, stdenv, which, - wrapGAppsHook, + wrapGAppsHook3, wxGTK, zlib, # Boolean guard flags @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config which - wrapGAppsHook + wrapGAppsHook3 wxGTK ]; diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index 0076e5b0ba298..218d8fd7780d1 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -14,7 +14,7 @@ , networkmanager , upower , typescript -, wrapGAppsHook +, wrapGAppsHook3 , linux-pam }: @@ -43,7 +43,7 @@ buildNpmPackage rec { gjs gobject-introspection typescript - wrapGAppsHook + wrapGAppsHook3 ]; # Most of the build inputs here are basically needed for their typelibs. diff --git a/pkgs/by-name/an/annotator/package.nix b/pkgs/by-name/an/annotator/package.nix index 3d2498e335009..115d6db2d8cb5 100644 --- a/pkgs/by-name/an/annotator/package.nix +++ b/pkgs/by-name/an/annotator/package.nix @@ -5,7 +5,7 @@ , meson , ninja , vala -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , libgee , pantheon @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index 82cafc40bd74c..39c59017ab3af 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -54,7 +54,7 @@ , libgpg-error , libxkbcommon , osm-gps-map -, wrapGAppsHook +, wrapGAppsHook3 , rav1e , dav1d , libgcrypt @@ -98,7 +98,7 @@ stdenv.mkDerivation { pkg-config perlPackages.perl python3Packages.jsonschema - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/an/anyrun/package.nix b/pkgs/by-name/an/anyrun/package.nix index 8d0ee80d7e8a7..69362904f4123 100644 --- a/pkgs/by-name/an/anyrun/package.nix +++ b/pkgs/by-name/an/anyrun/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , cairo , gdk-pixbuf @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ap/apvlv/package.nix b/pkgs/by-name/ap/apvlv/package.nix index 5771769323512..77ad5a034daae 100644 --- a/pkgs/by-name/ap/apvlv/package.nix +++ b/pkgs/by-name/ap/apvlv/package.nix @@ -22,7 +22,7 @@ stdenv, testers, webkitgtk, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles man pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index 9b8419df89053..46b1f7da09857 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -24,7 +24,7 @@ , python3 , systemd , tzdata -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { glib # for schema hook intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix index 007e7982272ab..7973291d3db18 100644 --- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix @@ -20,7 +20,7 @@ , python3 , systemd , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { intltool pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals withDocumentation [ docbook_xsl docbook_xml_dtd_45 diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 4b3d33ea81be6..d2a5860098b4c 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -16,7 +16,7 @@ , mate , pkg-config , systemd -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { cmake intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix index a4b2d2f1a346e..8e0b98bdc766b 100644 --- a/pkgs/by-name/bi/biglybt/package.nix +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, jre, - wrapGAppsHook, + wrapGAppsHook3, nix-update-script, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-a7g9sB3orO2m0X7qNwQ1dDygYPhs/b6kX0RDSG8Wq2U="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/bu/buttermanager/package.nix b/pkgs/by-name/bu/buttermanager/package.nix index fe738b3712195..80c3dd4e3084e 100644 --- a/pkgs/by-name/bu/buttermanager/package.nix +++ b/pkgs/by-name/bu/buttermanager/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , qt5 }: @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 qt5.wrapQtAppsHook ]; diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix index b34850c92599a..67c82e52a400a 100644 --- a/pkgs/by-name/cl/clamtk/package.nix +++ b/pkgs/by-name/cl/clamtk/package.nix @@ -1,7 +1,7 @@ { lib , perlPackages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , perl , clamav @@ -18,7 +18,7 @@ perlPackages.buildPerlPackage rec { hash = "sha256-ClBsBXbGj67zgrkA9EjgK7s3OmXOJA+xV5xLGOcMsbI="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ perl clamav ]; propagatedBuildInputs = with perlPackages; [ Glib LWP LWPProtocolHttps TextCSV JSON LocaleGettext Gtk3 ]; diff --git a/pkgs/by-name/cl/clash-verge/package.nix b/pkgs/by-name/cl/clash-verge/package.nix index 1a8d6a99198e8..83318a36f3f69 100644 --- a/pkgs/by-name/cl/clash-verge/package.nix +++ b/pkgs/by-name/cl/clash-verge/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , clash-meta , openssl @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; diff --git a/pkgs/by-name/co/connman-gtk/package.nix b/pkgs/by-name/co/connman-gtk/package.nix index 46dce2aa29303..181c43bcde208 100644 --- a/pkgs/by-name/co/connman-gtk/package.nix +++ b/pkgs/by-name/co/connman-gtk/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, intltool, pkg-config, -gtk3, connman, openconnect, wrapGAppsHook }: +gtk3, connman, openconnect, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "connman-gtk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { automake intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/co/connman-notify/package.nix b/pkgs/by-name/co/connman-notify/package.nix index c8df6bc893527..4b9002441a926 100644 --- a/pkgs/by-name/co/connman-notify/package.nix +++ b/pkgs/by-name/co/connman-notify/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook }: +{ lib, fetchFromGitLab, python3Packages, glib, gobject-introspection, wrapGAppsHook3 }: python3Packages.buildPythonApplication { pname = "connman-notify"; @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication { format = "other"; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ glib ]; diff --git a/pkgs/by-name/cp/cpu-x/package.nix b/pkgs/by-name/cp/cpu-x/package.nix index d8db8212ba760..1f8df689b79a9 100644 --- a/pkgs/by-name/cp/cpu-x/package.nix +++ b/pkgs/by-name/cp/cpu-x/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses -, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper +, libcpuid, pciutils, procps, wrapGAppsHook3, nasm, makeWrapper , opencl-headers, ocl-icd , vulkan-headers, vulkan-loader, glfw , libXdmcp, pcre, util-linux @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-iaqqBeoack41D07Bbr0Fo1JXfF2ksXbqS5V5Ymt6Qvg="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps vulkan-headers vulkan-loader glfw diff --git a/pkgs/by-name/cr/cryptor/package.nix b/pkgs/by-name/cr/cryptor/package.nix index b47edbbab5722..edbaa0903b0a8 100644 --- a/pkgs/by-name/cr/cryptor/package.nix +++ b/pkgs/by-name/cr/cryptor/package.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , gocryptfs , gtk3 , json-glib @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix index 8100b835e44ac..9e1de9bbde35f 100644 --- a/pkgs/by-name/di/digikam/package.nix +++ b/pkgs/by-name/di/digikam/package.nix @@ -1,4 +1,4 @@ -{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook +{ stdenv, config, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook3 # For `digitaglinktree` , perl, sqlite @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { extra-cmake-modules libsForQt5.kdoctools libsForQt5.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 3ce0d8b9b00df..f26271789d2ac 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook }: +{ lib, python3, fetchFromGitHub, gtk3, gobject-introspection, gtk-layer-shell, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { pname = "discover-overlay"; version = "0.7.0"; @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index a48355fbb8250..80e7b256b2977 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchPypi -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , librsvg , xorg @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gtk3 ]; diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index 32529e8fcf2ef..004e94fda27df 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -8,7 +8,7 @@ , libappindicator , libayatana-appindicator , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/du/dune3d/package.nix b/pkgs/by-name/du/dune3d/package.nix index 797819354a1b9..afe3a05f59384 100644 --- a/pkgs/by-name/du/dune3d/package.nix +++ b/pkgs/by-name/du/dune3d/package.nix @@ -16,7 +16,7 @@ pkg-config, python3, stdenv, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ cmake diff --git a/pkgs/by-name/ed/eduvpn-client/package.nix b/pkgs/by-name/ed/eduvpn-client/package.nix index e3b5b9d8a04c3..8a4fd7db89e82 100644 --- a/pkgs/by-name/ed/eduvpn-client/package.nix +++ b/pkgs/by-name/ed/eduvpn-client/package.nix @@ -7,7 +7,7 @@ , libsecret , networkmanager , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gdk-pixbuf gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 436d94bd0f985..61fa9a395e406 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -27,7 +27,7 @@ , stdenv , swig , vtk -, wrapGAppsHook +, wrapGAppsHook3 , xercesc , zlib }: @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { pyside2-tools gfortran wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 529516bb0da97..87674942c917d 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -5,7 +5,7 @@ , fetchDebianPatch , copyDesktopItems , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , unzip , curl , glib @@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ copyDesktopItems pkg-config - wrapGAppsHook + wrapGAppsHook3 unzip ]; diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index b4683af8912eb..a76420c3c6e43 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -228,7 +228,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dplugin_msr=disabled" ]; - # TODO: wrapGAppsHook wraps efi capsule even though it is not ELF + # TODO: wrapGAppsHook3 wraps efi capsule even though it is not ELF dontWrapGApps = true; doCheck = true; diff --git a/pkgs/by-name/ge/germinal/package.nix b/pkgs/by-name/ge/germinal/package.nix index 4d7409bf4a43d..d38e31aea8f32 100644 --- a/pkgs/by-name/ge/germinal/package.nix +++ b/pkgs/by-name/ge/germinal/package.nix @@ -9,7 +9,7 @@ , pkg-config , tmux , vte -, wrapGAppsHook +, wrapGAppsHook3 , nixosTests }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index 7ada2ddb663b4..1ac8deb248619 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , gnome , libsecret @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook - (wrapGAppsHook.override { inherit makeWrapper; }) + (wrapGAppsHook3.override { inherit makeWrapper; }) ]; buildInputs = [ diff --git a/pkgs/by-name/gm/gmetronome/package.nix b/pkgs/by-name/gm/gmetronome/package.nix index 64d0c19a966c4..adebcf9a6bc94 100644 --- a/pkgs/by-name/gm/gmetronome/package.nix +++ b/pkgs/by-name/gm/gmetronome/package.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , pkg-config , autoreconfHook -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , libpulseaudio }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/gp/gpscorrelate/package.nix b/pkgs/by-name/gp/gpscorrelate/package.nix index 6e029d4113713..e50f160e54156 100644 --- a/pkgs/by-name/gp/gpscorrelate/package.nix +++ b/pkgs/by-name/gp/gpscorrelate/package.nix @@ -9,7 +9,7 @@ , docbook_xsl , docbook_xml_dtd_42 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , desktopToDarwinBundle }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { docbook_xsl libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ diff --git a/pkgs/by-name/gt/gtimelog/package.nix b/pkgs/by-name/gt/gtimelog/package.nix index 1385751329452..471a0fd890b89 100644 --- a/pkgs/by-name/gt/gtimelog/package.nix +++ b/pkgs/by-name/gt/gtimelog/package.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook3 , glibcLocales, gobject-introspection, gtk3, libsoup_3, libsecret }: @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-+iBHfbUJtAtI/vcHj0Y8f9OxAp1SnhQyMqedVzSYPZQ="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glibcLocales gtk3 libsoup_3 libsecret ]; propagatedBuildInputs = with python3Packages; [ pygobject3 diff --git a/pkgs/by-name/gt/gtkhash/package.nix b/pkgs/by-name/gt/gtkhash/package.nix index 63d0c788c976b..87cfcf374bd07 100644 --- a/pkgs/by-name/gt/gtkhash/package.nix +++ b/pkgs/by-name/gt/gtkhash/package.nix @@ -5,7 +5,7 @@ , ninja , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , glib , openssl @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ninja cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ir/ironbar/package.nix b/pkgs/by-name/ir/ironbar/package.nix index 1576f06528c6b..6844a5ae26ec9 100644 --- a/pkgs/by-name/ir/ironbar/package.nix +++ b/pkgs/by-name/ir/ironbar/package.nix @@ -7,7 +7,7 @@ , glib , shared-mime-info , gsettings-desktop-schemas -, wrapGAppsHook +, wrapGAppsHook3 , gtk-layer-shell , gnome , libxkbcommon @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix index 56a977eeeb138..a846bc775a7a8 100644 --- a/pkgs/by-name/ko/konbucase/package.nix +++ b/pkgs/by-name/ko/konbucase/package.nix @@ -5,7 +5,7 @@ , ninja , vala , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , pantheon , gtksourceview5 }: @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ninja vala pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index 84da01165fea6..5efa194fb36b6 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -7,7 +7,7 @@ fetchYarnDeps, makeDesktopItem, copyDesktopItems, - wrapGAppsHook, + wrapGAppsHook3, electron, }: @@ -37,7 +37,7 @@ mkYarnPackage rec { nativeBuildInputs = [ copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/la/labwc-gtktheme/package.nix b/pkgs/by-name/la/labwc-gtktheme/package.nix index dd2e9ca254951..2d4dd33518403 100644 --- a/pkgs/by-name/la/labwc-gtktheme/package.nix +++ b/pkgs/by-name/la/labwc-gtktheme/package.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , unstableGitUpdater }: @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/la/labwc-tweaks/package.nix b/pkgs/by-name/la/labwc-tweaks/package.nix index fee334974a276..22189e74be311 100644 --- a/pkgs/by-name/la/labwc-tweaks/package.nix +++ b/pkgs/by-name/la/labwc-tweaks/package.nix @@ -7,7 +7,7 @@ , gtk3 , libxml2 , xkeyboard_config -, wrapGAppsHook +, wrapGAppsHook3 , unstableGitUpdater }: @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index cad371b8919f2..75cc9c128187f 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -3,7 +3,7 @@ , buildDotnetModule , fetchFromGitHub , dotnetCorePackages -, wrapGAppsHook +, wrapGAppsHook3 , libX11 , libICE @@ -43,7 +43,7 @@ buildDotnetModule rec { "HangoverAvalonia/HangoverAvalonia.csproj" ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; runtimeDeps = [ # For Avalonia UI diff --git a/pkgs/by-name/mc/mcomix/package.nix b/pkgs/by-name/mc/mcomix/package.nix index 170386de3e4c0..900b40fed4b0d 100644 --- a/pkgs/by-name/mc/mcomix/package.nix +++ b/pkgs/by-name/mc/mcomix/package.nix @@ -6,7 +6,7 @@ , mcomix , python3 , testers -, wrapGAppsHook +, wrapGAppsHook3 # Recommended Dependencies: , p7zip @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix index 5625c380eaa7a..572275490800d 100644 --- a/pkgs/by-name/me/mednaffe/package.nix +++ b/pkgs/by-name/me/mednaffe/package.nix @@ -6,7 +6,7 @@ mednafen, pkg-config, stdenv, - wrapGAppsHook, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoreconfHook pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/me/menulibre/package.nix b/pkgs/by-name/me/menulibre/package.nix index 134c7cc98cc90..414f591965eb9 100644 --- a/pkgs/by-name/me/menulibre/package.nix +++ b/pkgs/by-name/me/menulibre/package.nix @@ -5,7 +5,7 @@ , gtk3 , intltool , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , nix-update-script , testers , menulibre @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { gtk3 intltool gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; postPatch = '' diff --git a/pkgs/by-name/my/myxer/package.nix b/pkgs/by-name/my/myxer/package.nix index 200ca4bce15c4..61dd704db6774 100644 --- a/pkgs/by-name/my/myxer/package.nix +++ b/pkgs/by-name/my/myxer/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , libpulseaudio , glib , pango @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-IH+SLIHO/wu+przH+mgOEnH9m+iAE5s/BJhh0UUHR/0="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libpulseaudio glib pango gtk3 ]; diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index 78c15e6dfe833..34ba7112e43f0 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -14,7 +14,7 @@ , pkg-config , stdenv , unzip -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { fltk pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 unzip ]; diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 42a69d5949740..647ca14b3c2b7 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -6,7 +6,7 @@ , gtk-layer-shell , gtk3 , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils }: @@ -29,7 +29,7 @@ buildGoModule { nativeBuildInputs = [ gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index cae3fd2d25218..8efe84411f501 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -4,7 +4,7 @@ , gtk-layer-shell , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ol/olvid/package.nix b/pkgs/by-name/ol/olvid/package.nix index 1aaf472fef5a8..95e3c74ae3a86 100644 --- a/pkgs/by-name/ol/olvid/package.nix +++ b/pkgs/by-name/ol/olvid/package.nix @@ -13,7 +13,7 @@ , openjfx21 , autoPatchelfHook , makeBinaryWrapper -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ autoPatchelfHook makeBinaryWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix index 348f4b658b4cd..ae2ad038d58e2 100644 --- a/pkgs/by-name/on/onedriver/package.nix +++ b/pkgs/by-name/on/onedriver/package.nix @@ -6,7 +6,7 @@ , glib , fuse , installShellFiles -, wrapGAppsHook +, wrapGAppsHook3 , wrapperDir ? "/run/wrappers/bin" }: let @@ -24,7 +24,7 @@ buildGoModule { inherit pname version src; vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA="; - nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ]; buildInputs = [ webkitgtk_4_1 glib fuse ]; ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ]; diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-bin/package.nix index 8abf0909e6b33..4c9c0cd1e3263 100644 --- a/pkgs/by-name/on/onlyoffice-bin/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin/package.nix @@ -28,7 +28,7 @@ , nss , pulseaudio , qt5 -, wrapGAppsHook +, wrapGAppsHook3 , xkeyboard_config , xorg }: @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix index 0b54203008140..538e55b8bb25e 100644 --- a/pkgs/by-name/on/onlyoffice-bin_latest/package.nix +++ b/pkgs/by-name/on/onlyoffice-bin_latest/package.nix @@ -31,7 +31,7 @@ , nss , pulseaudio , qt5 -, wrapGAppsHook +, wrapGAppsHook3 , xkeyboard_config , xorg }: @@ -76,7 +76,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 4483d5271fb13..1e14580b42bb5 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -34,7 +34,7 @@ , tbb_2021_11 , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xorg }: let @@ -97,7 +97,7 @@ clangStdenv.mkDerivation rec { flex libsForQt5.qt5.wrapQtAppsHook llvmPackages.bintools - wrapGAppsHook + wrapGAppsHook3 ninja pkg-config ]; diff --git a/pkgs/by-name/op/openswitcher/package.nix b/pkgs/by-name/op/openswitcher/package.nix index 569ed3597ea62..fb47a9f95a5a8 100644 --- a/pkgs/by-name/op/openswitcher/package.nix +++ b/pkgs/by-name/op/openswitcher/package.nix @@ -9,7 +9,7 @@ , ninja , pkg-config , scdoc -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ninja pkg-config scdoc - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix index 2ae6a649c84cd..edc89bbaf2ba6 100644 --- a/pkgs/by-name/or/orca/package.nix +++ b/pkgs/by-name/or/orca/package.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gettext , yelp-tools @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja - wrapGAppsHook + wrapGAppsHook3 pkg-config gettext yelp-tools diff --git a/pkgs/by-name/pa/pablodraw/package.nix b/pkgs/by-name/pa/pablodraw/package.nix index 418b9a9c01513..1f1d4ccd7935d 100644 --- a/pkgs/by-name/pa/pablodraw/package.nix +++ b/pkgs/by-name/pa/pablodraw/package.nix @@ -2,7 +2,7 @@ , buildDotnetModule , fetchFromGitHub , dotnetCorePackages -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems , gtk3 , libnotify @@ -35,7 +35,7 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - nativeBuildInputs = [ wrapGAppsHook copyDesktopItems ]; + nativeBuildInputs = [ wrapGAppsHook3 copyDesktopItems ]; runtimeDeps = [ gtk3 libnotify ]; diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix index de900ef102827..dcbee261c4610 100644 --- a/pkgs/by-name/pa/paper-plane/package.nix +++ b/pkgs/by-name/pa/paper-plane/package.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , gtk4 -, wrapGAppsHook +, wrapGAppsHook3 , libadwaita , tdlib , rlottie @@ -35,7 +35,7 @@ let gtk4-paperplane = gtk4.overrideAttrs (prev: { patches = (prev.patches or []) ++ [ "${src}/build-aux/gtk-reversed-list.patch" ]; }); - wrapPaperPlaneHook = wrapGAppsHook.override { + wrapPaperPlaneHook = wrapGAppsHook3.override { gtk3 = gtk4-paperplane; }; # libadwaita has gtk4 in propagatedBuildInputs so it must be overrided diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix index f02efb9f2e901..46c6bedd77104 100644 --- a/pkgs/by-name/ph/photocollage/package.nix +++ b/pkgs/by-name/ph/photocollage/package.nix @@ -4,7 +4,7 @@ , gettext , gdk-pixbuf , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix index d624184c9695b..da86fe32a9ad1 100644 --- a/pkgs/by-name/pl/plasticity/package.nix +++ b/pkgs/by-name/pl/plasticity/package.nix @@ -27,7 +27,7 @@ , systemd , trash-cli , vulkan-loader -, wrapGAppsHook +, wrapGAppsHook3 , xdg-utils , xorg }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook rpmextract mesa ]; + nativeBuildInputs = [ wrapGAppsHook3 autoPatchelfHook rpmextract mesa ]; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/po/popcorntime/package.nix b/pkgs/by-name/po/popcorntime/package.nix index 240836d600491..7cf0d3c3c3078 100644 --- a/pkgs/by-name/po/popcorntime/package.nix +++ b/pkgs/by-name/po/popcorntime/package.nix @@ -10,7 +10,7 @@ , stdenv , unzip , udev -, wrapGAppsHook +, wrapGAppsHook3 , copyDesktopItems }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { autoPatchelfHook makeWrapper unzip - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/by-name/po/pot/package.nix b/pkgs/by-name/po/pot/package.nix index aac04e5a0bcce..0547e72f48198 100644 --- a/pkgs/by-name/po/pot/package.nix +++ b/pkgs/by-name/po/pot/package.nix @@ -3,7 +3,7 @@ , stdenvNoCC , rustPlatform , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , cargo , rustc , cargo-tauri @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { cargo rustc cargo-tauri - wrapGAppsHook + wrapGAppsHook3 nodePackages.pnpm pkg-config ]; diff --git a/pkgs/by-name/po/powersupply/package.nix b/pkgs/by-name/po/powersupply/package.nix index ce86cf2da7d0c..31216d84675a3 100644 --- a/pkgs/by-name/po/powersupply/package.nix +++ b/pkgs/by-name/po/powersupply/package.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 4e35f393dbcb1..657a218069506 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -14,7 +14,7 @@ , gettext , desktop-file-utils , glib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { automake libtool desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix index 71321a76fbd5f..353bca5fea9f3 100644 --- a/pkgs/by-name/qu/quark-goldleaf/package.nix +++ b/pkgs/by-name/qu/quark-goldleaf/package.nix @@ -6,7 +6,7 @@ , makeDesktopItem , copyDesktopItems , imagemagick -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 }: @@ -46,7 +46,7 @@ maven'.buildMavenPackage rec { nativeBuildInputs = [ imagemagick # for icon conversion copyDesktopItems - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 ]; diff --git a/pkgs/by-name/rm/rmenu/package.nix b/pkgs/by-name/rm/rmenu/package.nix index 15de597438fa5..f8b9e3e657faa 100644 --- a/pkgs/by-name/rm/rmenu/package.nix +++ b/pkgs/by-name/rm/rmenu/package.nix @@ -7,7 +7,7 @@ , pkg-config , rustPlatform , webkitgtk_4_1 -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { pname = "rmenu"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index 8b4f2e79c2be1..bf4d5ec499960 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -25,7 +25,7 @@ , stdenv , util-linuxMinimal , vte -, wrapGAppsHook +, wrapGAppsHook3 , xmlto }: @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmake libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix index ad3afe454b65a..70b7f84c1290b 100644 --- a/pkgs/by-name/sa/satellite/package.nix +++ b/pkgs/by-name/sa/satellite/package.nix @@ -5,7 +5,7 @@ , gtk3 , libhandy , modemmanager -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sm/smartgithg/package.nix b/pkgs/by-name/sm/smartgithg/package.nix index 4693511951a1f..57625a97b14a6 100644 --- a/pkgs/by-name/sm/smartgithg/package.nix +++ b/pkgs/by-name/sm/smartgithg/package.nix @@ -6,7 +6,7 @@ , gtk3 , glib , gnome -, wrapGAppsHook +, wrapGAppsHook3 , libXtst , which }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hash = "sha256-gXfHmRPUhs8s7IQIhN0vQyx8NpLrS28ufNNYOMA4AXw="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix index c3d19bac383b8..3f57aee0ed47d 100644 --- a/pkgs/by-name/sn/snes9x/package.nix +++ b/pkgs/by-name/sn/snes9x/package.nix @@ -23,7 +23,7 @@ python3, stdenv, util-linuxMinimal, - wrapGAppsHook, + wrapGAppsHook3, zlib, # Boolean flags withGtk ? false, @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withGtk [ cmake ninja - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix index c43ce82c5ea77..a5b68fbce93f1 100644 --- a/pkgs/by-name/sn/snippetexpandergui/package.nix +++ b/pkgs/by-name/sn/snippetexpandergui/package.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromSourcehut -, wrapGAppsHook +, wrapGAppsHook3 , wails , scdoc , installShellFiles @@ -28,7 +28,7 @@ buildGoModule rec { wails scdoc installShellFiles - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sn/snippetexpanderx/package.nix b/pkgs/by-name/sn/snippetexpanderx/package.nix index 50da8f05503fe..c1d7827a4cc59 100644 --- a/pkgs/by-name/sn/snippetexpanderx/package.nix +++ b/pkgs/by-name/sn/snippetexpanderx/package.nix @@ -3,7 +3,7 @@ , fetchFromSourcehut , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , installShellFiles , scdoc , at-spi2-atk @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala - wrapGAppsHook + wrapGAppsHook3 installShellFiles scdoc ]; diff --git a/pkgs/by-name/sp/spotube/package.nix b/pkgs/by-name/sp/spotube/package.nix index 03ee6ad8d8bb6..cc63a6b680a10 100644 --- a/pkgs/by-name/sp/spotube/package.nix +++ b/pkgs/by-name/sp/spotube/package.nix @@ -8,7 +8,7 @@ makeBinaryWrapper, makeWrapper, undmg, - wrapGAppsHook, + wrapGAppsHook3, libappindicator, libnotify, @@ -84,7 +84,7 @@ let autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index d274abae5e358..f394cce79ada7 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -6,7 +6,7 @@ gtk3, webkitgtk, pkg-config, - wrapGAppsHook, + wrapGAppsHook3, parallel-disk-usage, fetchFromGitHub, buildNpmPackage, @@ -65,7 +65,7 @@ in cp ${parallel-disk-usage}/bin/pdu bin/pdu-${stdenv.hostPlatform.config} ''; - nativeBuildInputs = [pkg-config wrapGAppsHook copyDesktopItems]; + nativeBuildInputs = [pkg-config wrapGAppsHook3 copyDesktopItems]; buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; # Disable checkPhase, since the project doesn't contain tests diff --git a/pkgs/by-name/sw/sway-easyfocus/package.nix b/pkgs/by-name/sw/sway-easyfocus/package.nix index 022770a223441..43a9f9ab1340c 100644 --- a/pkgs/by-name/sw/sway-easyfocus/package.nix +++ b/pkgs/by-name/sw/sway-easyfocus/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , atk , cairo , gdk-pixbuf @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/sw/sway/package.nix b/pkgs/by-name/sw/sway/package.nix index 3e9ed51613f82..47906be115847 100644 --- a/pkgs/by-name/sw/sway/package.nix +++ b/pkgs/by-name/sw/sway/package.nix @@ -2,7 +2,7 @@ , sway-unwrapped , makeWrapper, symlinkJoin, writeShellScriptBin , withBaseWrapper ? true, extraSessionCommands ? "", dbus -, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3 +, withGtkWrapper ? false, wrapGAppsHook3, gdk-pixbuf, glib, gtk3 , extraOptions ? [] # E.g.: [ "--verbose" ] # Used by the NixOS module: , isNixOS ? false @@ -41,7 +41,7 @@ in symlinkJoin rec { strictDeps = false; nativeBuildInputs = [ makeWrapper ] - ++ (optional withGtkWrapper wrapGAppsHook); + ++ (optional withGtkWrapper wrapGAppsHook3); buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ]; diff --git a/pkgs/by-name/sw/swayosd/package.nix b/pkgs/by-name/sw/swayosd/package.nix index d3238053c0196..c6e9dc2a809f3 100644 --- a/pkgs/by-name/sw/swayosd/package.nix +++ b/pkgs/by-name/sw/swayosd/package.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , brightnessctl , cargo , coreutils @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 pkg-config meson rustc diff --git a/pkgs/by-name/te/textsnatcher/package.nix b/pkgs/by-name/te/textsnatcher/package.nix index 21b75c31a37f0..670c87faeba53 100644 --- a/pkgs/by-name/te/textsnatcher/package.nix +++ b/pkgs/by-name/te/textsnatcher/package.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , pantheon , libhandy @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { vala pkg-config desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/th/themix-gui/package.nix b/pkgs/by-name/th/themix-gui/package.nix index c73724a0ca272..8495234c5ca5e 100644 --- a/pkgs/by-name/th/themix-gui/package.nix +++ b/pkgs/by-name/th/themix-gui/package.nix @@ -8,7 +8,7 @@ , gtk3 , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -33,7 +33,7 @@ stdenv.mkDerivation { gobject-introspection py sassc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ti/tilix/package.nix b/pkgs/by-name/ti/tilix/package.nix index 2e0bdad0be8c3..4394a2a52f582 100644 --- a/pkgs/by-name/ti/tilix/package.nix +++ b/pkgs/by-name/ti/tilix/package.nix @@ -13,7 +13,7 @@ , gettext , gtkd , libsecret -, wrapGAppsHook +, wrapGAppsHook3 , libunwind , appstream , nixosTests @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 appstream ]; diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index 86a554b2f8aeb..07efeebccb3f6 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -13,7 +13,7 @@ , pkg-config , rustPlatform , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , sqlite }: @@ -98,7 +98,7 @@ rustPlatform.buildRustPackage { cmake pkg-config cargo-tauri - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/un/unison/package.nix b/pkgs/by-name/un/unison/package.nix index 2d68ba5799b47..9aeac3fa2d3e0 100644 --- a/pkgs/by-name/un/unison/package.nix +++ b/pkgs/by-name/un/unison/package.nix @@ -4,7 +4,7 @@ , ocamlPackages , copyDesktopItems , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , gsettings-desktop-schemas , enableX11 ? !stdenv.isDarwin }: @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] - ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook3 ]; buildInputs = lib.optionals enableX11 [ gsettings-desktop-schemas ocamlPackages.lablgtk3 ]; makeFlags = [ "PREFIX=$(out)" ] diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix index e44c3b73efecf..6e0f1078819bc 100644 --- a/pkgs/by-name/va/vaults/package.nix +++ b/pkgs/by-name/va/vaults/package.nix @@ -10,7 +10,7 @@ , rustPlatform , rustc , cargo -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk4 , libadwaita @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 cargo rustc rustPlatform.cargoSetupHook diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix index 9b89cca9a192b..86406bdba034c 100644 --- a/pkgs/by-name/vl/vlc/package.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -77,7 +77,7 @@ , unzip , wayland , wayland-protocols -, wrapGAppsHook +, wrapGAppsHook3 , xcbutilkeysyms , zlib @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config removeReferencesTo unzip - wrapGAppsHook + wrapGAppsHook3 ] ++ optionals chromecastSupport [ protobuf ] ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ] diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix index 20fe3507726e1..c1b08e4150e5c 100644 --- a/pkgs/by-name/wa/waybar/package.nix +++ b/pkgs/by-name/wa/waybar/package.nix @@ -41,7 +41,7 @@ , upower , wayland , wireplumber -, wrapGAppsHook +, wrapGAppsHook3 , cavaSupport ? true , evdevSupport ? true @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config scdoc - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 064638efd8ff1..3e8ef23cd6e15 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -7,7 +7,7 @@ , qt6 , wayland , glib -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 qt6.wrapQtAppsHook ]; diff --git a/pkgs/by-name/xc/xclicker/package.nix b/pkgs/by-name/xc/xclicker/package.nix index 3a6597dc48325..22cb19830c7be 100644 --- a/pkgs/by-name/xc/xclicker/package.nix +++ b/pkgs/by-name/xc/xclicker/package.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , libXtst }: @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index 7fc390049cb9e..e8e4a66dddcc3 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -23,7 +23,7 @@ , stdenv , vte , which -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { perl pkg-config which - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ python pyyaml diff --git a/pkgs/by-name/ye/yesplaymusic/package.nix b/pkgs/by-name/ye/yesplaymusic/package.nix index c5292401fa833..576547669f8cd 100644 --- a/pkgs/by-name/ye/yesplaymusic/package.nix +++ b/pkgs/by-name/ye/yesplaymusic/package.nix @@ -4,7 +4,7 @@ , _7zz , dpkg , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , alsa-lib , at-spi2-atk @@ -98,7 +98,7 @@ else stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; |