diff options
Diffstat (limited to 'pkgs/applications/misc')
128 files changed, 258 insertions, 258 deletions
diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 140adde918fc9..bfd9df01dbfac 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -5,7 +5,7 @@ , src , meta , makeShellWrapper -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , at-spi2-atk , at-spi2-core @@ -49,7 +49,7 @@ let in stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ makeShellWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeShellWrapper wrapGAppsHook3 ]; buildInputs = [ glib ]; dontConfigure = true; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 35677f56cccbc..1726ced0315de 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , sqlite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 508c59bab7c2d..46adf420932d2 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/auto-multiple-choice/default.nix b/pkgs/applications/misc/auto-multiple-choice/default.nix index bdd1e6fbb8540..c39430091e0d5 100644 --- a/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -3,7 +3,7 @@ , fetchurl , perlPackages , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , cairo , dblatex , gnumake @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: rec { nativeBuildInputs = [ pkg-config makeWrapper - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/avizo/default.nix b/pkgs/applications/misc/avizo/default.nix index 59021e92b0d87..77d942797abcd 100644 --- a/pkgs/applications/misc/avizo/default.nix +++ b/pkgs/applications/misc/avizo/default.nix @@ -13,7 +13,7 @@ , librsvg , gobject-introspection , gdk-pixbuf -, wrapGAppsHook +, wrapGAppsHook3 , pamixer , brightnessctl }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Vj8OrNlAstl0AXTeVAPdEf5JgnAmJwl9s3Jdc0ZiYQc="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config vala gobject-introspection wrapGAppsHook3 ]; buildInputs = [ dbus dbus-glib gdk-pixbuf glib gtk-layer-shell gtk3 librsvg ]; diff --git a/pkgs/applications/misc/bambu-studio/default.nix b/pkgs/applications/misc/bambu-studio/default.nix index 43b6cb8769ef7..388b10f1356d5 100644 --- a/pkgs/applications/misc/bambu-studio/default.nix +++ b/pkgs/applications/misc/bambu-studio/default.nix @@ -8,7 +8,7 @@ fetchFromGitHub, cmake, pkg-config, - wrapGAppsHook, + wrapGAppsHook3, boost179, cereal, cgal_5, @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index d02712848b72a..ee988b79f8219 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, cmake, curl, xorg, avahi, qtbase, mkDerivation, - openssl, wrapGAppsHook, + openssl, wrapGAppsHook3, avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }, fetchpatch }: @@ -32,7 +32,7 @@ mkDerivation rec { ]; buildInputs = [ curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; - nativeBuildInputs = [ cmake wrapGAppsHook ]; + nativeBuildInputs = [ cmake wrapGAppsHook3 ]; postFixup = '' substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier" diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index c6e4adf8a560a..bb0e777186a28 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -3,7 +3,7 @@ , fetchurl , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , glib , gtk3 , libnotify @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/break-time/default.nix b/pkgs/applications/misc/break-time/default.nix index a4bbf4d4c104e..2b6263e3223e7 100644 --- a/pkgs/applications/misc/break-time/default.nix +++ b/pkgs/applications/misc/break-time/default.nix @@ -6,7 +6,7 @@ , python3 , rustPlatform , lib -, wrapGAppsHook +, wrapGAppsHook3 }: rustPlatform.buildRustPackage rec { @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config python3 # needed for Rust xcb package - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/caerbannog/default.nix b/pkgs/applications/misc/caerbannog/default.nix index 0d21c7e165705..0ca33877d124f 100644 --- a/pkgs/applications/misc/caerbannog/default.nix +++ b/pkgs/applications/misc/caerbannog/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , atk , libhandy @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index ce72458f3a0f6..bdd8af4ebffed 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -26,7 +26,7 @@ , sqlite , wrapQtAppsHook , xdg-utils -, wrapGAppsHook +, wrapGAppsHook3 , unrarSupport ? false }: @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config qmake removeReferencesTo - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index 665957ca0ea1e..1221703006322 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c="; }; - nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook3 ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index ffa44c63f96c4..48d382e284ff3 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , gtksourceview , gtksourceviewmm @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cmake pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index 8486db6f7fc03..a51279c73a261 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -11,7 +11,7 @@ , glib , gtk3 , libgee -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "cipher"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index b40bc4fec9303..0bd48d2adf63d 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, stdenv , autoreconfHook, intltool, pkg-config -, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: +, gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "clipit"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index 336b4d7c1a507..15db663db99ee 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -19,7 +19,7 @@ , setuptools , python , pytestCheckHook -, wrapGAppsHook +, wrapGAppsHook3 }: buildPythonApplication rec { @@ -43,7 +43,7 @@ buildPythonApplication rec { nativeBuildInputs = [ # Needed to recognize gobject namespaces gobject-introspection - wrapGAppsHook + wrapGAppsHook3 setuptools ]; diff --git a/pkgs/applications/misc/diffuse/default.nix b/pkgs/applications/misc/diffuse/default.nix index 0f5cf3c0adc1c..a4a9e73db86ed 100644 --- a/pkgs/applications/misc/diffuse/default.nix +++ b/pkgs/applications/misc/diffuse/default.nix @@ -3,7 +3,7 @@ , meson , ninja , gettext -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , pango , gdk-pixbuf @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 meson ninja gettext diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 3b147bdcc3604..815a482a216f3 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -6,7 +6,7 @@ , keybinder3 , libwnck , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { glib.dev gobject-introspection python3Packages.polib - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/fbmenugen/default.nix b/pkgs/applications/misc/fbmenugen/default.nix index 90d3f3b014248..56a3ce5f28dd1 100644 --- a/pkgs/applications/misc/fbmenugen/default.nix +++ b/pkgs/applications/misc/fbmenugen/default.nix @@ -6,7 +6,7 @@ , perlPackages , substituteAll , xorg -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/feedbackd/default.nix b/pkgs/applications/misc/feedbackd/default.nix index 45da9c1afaa8c..f0d90a495c771 100644 --- a/pkgs/applications/misc/feedbackd/default.nix +++ b/pkgs/applications/misc/feedbackd/default.nix @@ -12,7 +12,7 @@ , ninja , pkg-config , vala -, wrapGAppsHook +, wrapGAppsHook3 , glib , gsound , json-glib @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/findex/default.nix b/pkgs/applications/misc/findex/default.nix index 29ddc3d461a4c..8af4fc35d7de8 100644 --- a/pkgs/applications/misc/findex/default.nix +++ b/pkgs/applications/misc/findex/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , keybinder3 }: @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/opt/findex/style.css' "$out/share/findex/style.css" ''; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ keybinder3 ]; diff --git a/pkgs/applications/misc/fluxboxlauncher/default.nix b/pkgs/applications/misc/fluxboxlauncher/default.nix index 19e70ad7c54cf..7172ce535071a 100644 --- a/pkgs/applications/misc/fluxboxlauncher/default.nix +++ b/pkgs/applications/misc/fluxboxlauncher/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , python3 , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , glibcLocales , gobject-introspection , gettext @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 309d8fa2faf5d..9568c0c929b0a 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -16,7 +16,7 @@ , gtk3 , gnome , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection # withWebkit enables the "webkit" feature, also known as Google Fonts , withWebkit ? true, glib-networking, libsoup, webkitgtk @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { desktop-file-utils vala yelp-tools - wrapGAppsHook + wrapGAppsHook3 # For https://github.com/FontManager/master/blob/master/lib/unicode/meson.build gobject-introspection ]; diff --git a/pkgs/applications/misc/fontfinder/default.nix b/pkgs/applications/misc/fontfinder/default.nix index f0fc3dfd3a7d7..db55b02065265 100644 --- a/pkgs/applications/misc/fontfinder/default.nix +++ b/pkgs/applications/misc/fontfinder/default.nix @@ -5,7 +5,7 @@ , pkg-config , rustPlatform , rustc -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gtk3 , libsoup_3 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { pkg-config rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index f53ea0f030ca7..8f5c4c9c6b322 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -16,7 +16,7 @@ , hfsprogs , ntfs3g , libgee -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/foxtrotgps/default.nix b/pkgs/applications/misc/foxtrotgps/default.nix index 745a2357e2362..bb9049dde7919 100644 --- a/pkgs/applications/misc/foxtrotgps/default.nix +++ b/pkgs/applications/misc/foxtrotgps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchbzr, autoreconfHook, texinfo, help2man, imagemagick, pkg-config -, curl, gnome2, gpsd, gtk2, wrapGAppsHook +, curl, gnome2, gpsd, gtk2, wrapGAppsHook3 , intltool, libexif, python3Packages, sqlite }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man - imagemagick wrapGAppsHook intltool + imagemagick wrapGAppsHook3 intltool ]; buildInputs = [ diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index bc293b455b2a8..8aa564fc780bb 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -6,7 +6,7 @@ # Gtk deps # upstream gImagereader supports Qt too -, gobject-introspection, wrapGAppsHook +, gobject-introspection, wrapGAppsHook3 , gtkmm3, gtksourceview3, gtksourceviewmm, gtkspell3, gtkspellmm, cairomm }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { pythonEnv # Gtk specific - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index 0f6478f50fcd2..02662f11f96b4 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , perlPackages -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = with perlPackages; [ perl diff --git a/pkgs/applications/misc/genxword/default.nix b/pkgs/applications/misc/genxword/default.nix index 5ba67ecddcdb1..199a63f967198 100644 --- a/pkgs/applications/misc/genxword/default.nix +++ b/pkgs/applications/misc/genxword/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , pango , gtksourceview3 }: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gettext gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 523ba837f3a10..218110f6d17de 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -12,7 +12,7 @@ , IOKit , copyDesktopItems , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems pkg-config which wrapGAppsHook3 ]; buildInputs = [ gettext glib gtk2 libX11 libSM libICE ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index 5c8eb94712a68..67618ed083f56 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -31,7 +31,7 @@ , postgresql_15 , gobject-introspection , yelp-tools -, wrapGAppsHook +, wrapGAppsHook3 }: let @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { doxygen graphviz sphinx-build - wrapGAppsHook + wrapGAppsHook3 gobject-introspection # for setup hook ]; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 31c62f53423c4..dc5111c2a7222 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 -, gsettings-desktop-schemas, wrapGAppsHook +, gsettings-desktop-schemas, wrapGAppsHook3 }: let version = "1.3.11"; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index b4cca2f3bf63b..e1db3568fc4da 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -12,7 +12,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , polkit , udisks }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index dc4df70bc00e4..ca15d17ac866f 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -8,7 +8,7 @@ , gettext , itstool , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , glib , libsoup @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gettext itstool python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 5d86aece035da..1693c8a12dd51 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -26,7 +26,7 @@ , qtmultimedia , qtspeech , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+OiZEkhNV06fZXPXv9zDzgJS5M3isHlcOXee3p/ejpw="; }; - nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtsvg diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index a339e399e33d6..4f5df502fdfcd 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -2,7 +2,7 @@ , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , wrapQtAppsHook -, wrapGAppsHook +, wrapGAppsHook3 , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --replace "opencc.2" "opencc" ''; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook3 ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 9a18c9d5c9d97..daaf92fc72de2 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -10,7 +10,7 @@ , gnome , libchamplain , gdl -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ninja pkg-config vala - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + wrapGAppsHook3 # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index fdfcfe4ce3160..7feab95b003a1 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -7,7 +7,7 @@ , gexiv2 , pango , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gettext # Optional packages: , enableOSM ? true @@ -44,7 +44,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 intltool gettext gobject-introspection diff --git a/pkgs/applications/misc/grsync/default.nix b/pkgs/applications/misc/grsync/default.nix index da41a71d95eab..0e0a6cb87eebc 100644 --- a/pkgs/applications/misc/grsync/default.nix +++ b/pkgs/applications/misc/grsync/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook }: +{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "1.3.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 7131c5cd12275..857db4fd95bfd 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgs , glib, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkg-config, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook3 ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler diff --git a/pkgs/applications/misc/hamster/default.nix b/pkgs/applications/misc/hamster/default.nix index c425014e24ed8..bdab5d71e9ef2 100644 --- a/pkgs/applications/misc/hamster/default.nix +++ b/pkgs/applications/misc/hamster/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3Packages, intltool, glib, itstool, gtk3 -, wrapGAppsHook, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: +, wrapGAppsHook3, gobject-introspection, pango, gdk-pixbuf, atk, wafHook }: python3Packages.buildPythonApplication rec { pname = "hamster"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ python3Packages.setuptools - wrapGAppsHook + wrapGAppsHook3 intltool itstool wafHook diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index 111a36e3ee02a..3d7c6b6c205be 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -7,7 +7,7 @@ , openssl , webkitgtk , libappindicator -, wrapGAppsHook +, wrapGAppsHook3 , shared-mime-info , glib-networking }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook dpkg - wrapGAppsHook # required for FileChooser + wrapGAppsHook3 # required for FileChooser ]; buildInputs = [ diff --git a/pkgs/applications/misc/input-leap/default.nix b/pkgs/applications/misc/input-leap/default.nix index 567bb08fb911d..9f40735771fc5 100644 --- a/pkgs/applications/misc/input-leap/default.nix +++ b/pkgs/applications/misc/input-leap/default.nix @@ -21,7 +21,7 @@ , pkg-config , qtbase , qttools -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -36,7 +36,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config cmake wrapGAppsHook qttools ]; + nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 qttools ]; buildInputs = [ curl qtbase avahi libX11 libXext libXtst libXinerama libXrandr libXdmcp libICE libSM diff --git a/pkgs/applications/misc/keepassxc/default.nix b/pkgs/applications/misc/keepassxc/default.nix index e74a45c02f311..e8804f6009464 100644 --- a/pkgs/applications/misc/keepassxc/default.nix +++ b/pkgs/applications/misc/keepassxc/default.nix @@ -20,7 +20,7 @@ , qtsvg , qtx11extras , readline -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , zlib @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { qttools pkg-config ] - ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook; + ++ lib.optional (!stdenv.isDarwin) wrapGAppsHook3; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/misc/keeweb/default.nix b/pkgs/applications/misc/keeweb/default.nix index 22f3ad668ccbf..a7260dc509b72 100644 --- a/pkgs/applications/misc/keeweb/default.nix +++ b/pkgs/applications/misc/keeweb/default.nix @@ -4,7 +4,7 @@ , undmg , dpkg , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , makeWrapper , alsa-lib , at-spi2-atk @@ -92,7 +92,7 @@ else stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 makeWrapper ]; diff --git a/pkgs/applications/misc/keymapp/default.nix b/pkgs/applications/misc/keymapp/default.nix index 55cc3f3f9810f..59dae9589fa7a 100644 --- a/pkgs/applications/misc/keymapp/default.nix +++ b/pkgs/applications/misc/keymapp/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , autoPatchelfHook -, wrapGAppsHook +, wrapGAppsHook3 , libusb1 , webkitgtk , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ copyDesktopItems autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/keystore-explorer/default.nix b/pkgs/applications/misc/keystore-explorer/default.nix index fb5990f5dca0b..d5576ccb725e7 100644 --- a/pkgs/applications/misc/keystore-explorer/default.nix +++ b/pkgs/applications/misc/keystore-explorer/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook }: +{ fetchzip, lib, stdenv, jdk, runtimeShell, glib, wrapGAppsHook3 }: stdenv.mkDerivation rec { version = "5.5.3"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { # glib is necessary so file dialogs don't hang. buildInputs = [ glib ]; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 789ab7c688287..5364d090f75d2 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , gitUpdater }: python3.pkgs.buildPythonApplication rec { @@ -18,7 +18,7 @@ nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 98ba8836efca7..6cc5df92ae727 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchurl, fetchpatch, lib, - extra-cmake-modules, kdoctools, wrapGAppsHook, + extra-cmake-modules, kdoctools, wrapGAppsHook3, kconfig, kinit, kjsembed, taglib, exiv2, podofo, kcrash }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ taglib exiv2 podofo ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook3 ]; propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix index fbb33c7e096fe..8c22612ad452c 100644 --- a/pkgs/applications/misc/kupfer/default.nix +++ b/pkgs/applications/misc/kupfer/default.nix @@ -9,7 +9,7 @@ , keybinder3 , desktop-file-utils , shared-mime-info -, wrapGAppsHook +, wrapGAppsHook3 , wafHook , bash , dbus @@ -29,7 +29,7 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook intltool + wrapGAppsHook3 intltool # For setup hook gobject-introspection wafHook itstool # for help pages diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 3ee6148ef16b9..b16acc4787b78 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -15,7 +15,7 @@ , libnotify , pango , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 # check inputs , xvfb-run @@ -85,7 +85,7 @@ buildPythonApplication rec { hash = "sha256-Ed1bhugBe97XmY050A5jCPcnLj0Fd7qPX2p/Ab+YbOE="; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ atk gdk-pixbuf diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index ca7849c566a98..8c4e37661a8c6 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf, jq, bash , wayland, wayland-protocols -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "mako"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook3 ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ diff --git a/pkgs/applications/misc/maliit-keyboard/default.nix b/pkgs/applications/misc/maliit-keyboard/default.nix index 3669dfe5a5b7b..c67ac7a402fc9 100644 --- a/pkgs/applications/misc/maliit-keyboard/default.nix +++ b/pkgs/applications/misc/maliit-keyboard/default.nix @@ -17,7 +17,7 @@ , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: mkDerivation rec { @@ -58,7 +58,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; postInstall = '' diff --git a/pkgs/applications/misc/markets/default.nix b/pkgs/applications/misc/markets/default.nix index 436891482f19b..e24e902abc036 100644 --- a/pkgs/applications/misc/markets/default.nix +++ b/pkgs/applications/misc/markets/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , desktop-file-utils, glib, gtk3, meson, ninja, pkg-config, python3, vala -, wrapGAppsHook +, wrapGAppsHook3 , glib-networking, gobject-introspection, json-glib, libgee, libhandy, libsoup }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils glib gtk3 meson ninja pkg-config python3 vala - wrapGAppsHook gobject-introspection + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ glib glib-networking gtk3 json-glib libgee libhandy diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index c1a0b41a58ac4..e0a3921824de2 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -3,7 +3,7 @@ , meerk40t-camera , python3Packages , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index a02647f4a9fbc..e4e58d9bf6c3e 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,7 +8,7 @@ , python3 , shared-mime-info , vala -, wrapGAppsHook +, wrapGAppsHook3 , cairo , discount , glib @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { python3 shared-mime-info vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/minigalaxy/default.nix b/pkgs/applications/misc/minigalaxy/default.nix index ad694c01cdcba..aa31ffa5cc2b0 100644 --- a/pkgs/applications/misc/minigalaxy/default.nix +++ b/pkgs/applications/misc/minigalaxy/default.nix @@ -11,7 +11,7 @@ , steam-run , unzip , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gettext - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 92574896bbd97..caecc46d5432c 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -35,7 +35,7 @@ , cairo , libxkbcommon , libepoxy -, wrapGAppsHook +, wrapGAppsHook3 , at-spi2-core , dbus , bash @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config jre swig - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/notifymuch/default.nix b/pkgs/applications/misc/notifymuch/default.nix index 6ba819133eccf..72a0485b0a7ee 100644 --- a/pkgs/applications/misc/notifymuch/default.nix +++ b/pkgs/applications/misc/notifymuch/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gobject-introspection , libnotify -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , python3 }: @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 2a08b24435a28..8ab52711a6cee 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , gvfs , maven , jre @@ -42,7 +42,7 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ copyDesktopItems makeWrapper - wrapGAppsHook + wrapGAppsHook3 gvfs ]; diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 7a1393637dffd..651e4420280df 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -10,7 +10,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonApplication rec { @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/nwg-bar/default.nix b/pkgs/applications/misc/nwg-bar/default.nix index 356b1edb15aeb..d80986db6e030 100644 --- a/pkgs/applications/misc/nwg-bar/default.nix +++ b/pkgs/applications/misc/nwg-bar/default.nix @@ -5,7 +5,7 @@ , pkg-config , gtk3 , gtk-layer-shell -, wrapGAppsHook }: +, wrapGAppsHook3 }: buildGoModule rec { pname = "nwg-bar"; @@ -26,7 +26,7 @@ buildGoModule rec { vendorHash = "sha256-/kqhZcIuoN/XA0i1ua3lzVGn4ghkekFYScL1o3kgBX4="; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell librsvg ]; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index 22d4e20d5eef7..e014100f45c57 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -7,7 +7,7 @@ , gtk3 , pango , python310Packages -, wrapGAppsHook +, wrapGAppsHook3 , hyprlandSupport ? true , wlr-randr }: @@ -25,7 +25,7 @@ python310Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/pkgs/applications/misc/nwg-dock-hyprland/default.nix index 607dd7c22facf..19003c66a6755 100644 --- a/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -2,7 +2,7 @@ , buildGoModule , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtk-layer-shell }: @@ -21,7 +21,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk-layer-shell ]; meta = with lib; { diff --git a/pkgs/applications/misc/nwg-menu/default.nix b/pkgs/applications/misc/nwg-menu/default.nix index 6733a5dac3f4d..27be9aa08fa9e 100644 --- a/pkgs/applications/misc/nwg-menu/default.nix +++ b/pkgs/applications/misc/nwg-menu/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, buildGoModule, pkg-config, wrapGAppsHook, gobject-introspection +, buildGoModule, pkg-config, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, gtk3, pango, gdk-pixbuf, atk }: @@ -19,7 +19,7 @@ buildGoModule rec { doCheck = false; buildInputs = [ atk gtk3 gdk-pixbuf gtk-layer-shell pango ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 gobject-introspection ]; prePatch = '' for file in main.go tools.go; do diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 840b048d2d4cd..064fead047334 100644 --- a/pkgs/applications/misc/nwg-panel/default.nix +++ b/pkgs/applications/misc/nwg-panel/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub -, python3Packages, wrapGAppsHook, gobject-introspection +, python3Packages, wrapGAppsHook3, gobject-introspection , gtk-layer-shell, pango, gdk-pixbuf, atk # Extra packages called by various internal nwg-panel modules , hyprland # hyprctl @@ -28,12 +28,12 @@ python3Packages.buildPythonApplication rec { # No tests doCheck = false; - # Because of wrapGAppsHook + # Because of wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango playerctl ]; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; propagatedBuildInputs = (with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) # Run-time GTK dependency required by the Tray module diff --git a/pkgs/applications/misc/nwg-wrapper/default.nix b/pkgs/applications/misc/nwg-wrapper/default.nix index 5b28628318961..f5b524c890198 100644 --- a/pkgs/applications/misc/nwg-wrapper/default.nix +++ b/pkgs/applications/misc/nwg-wrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook, wlr-randr }: +{ lib, python3Packages, fetchFromGitHub, gtk-layer-shell, gtk3, gobject-introspection, wrapGAppsHook3, wlr-randr }: python3Packages.buildPythonPackage rec { pname = "nwg-wrapper"; @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-GKDAdjO67aedCEFHKDukQ+oPMomTPwFE/CvJu112fus="; }; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; buildInputs = [ gtk3 gtk-layer-shell ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index cdcdb2b1e5149..6f210791ce9af 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -23,7 +23,7 @@ , pkg-config , procps , python3 -, wrapGAppsHook +, wrapGAppsHook3 , xorg , yelp }: @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/openlp/default.nix b/pkgs/applications/misc/openlp/default.nix index a075a9bec6f5f..c77b494f08cac 100644 --- a/pkgs/applications/misc/openlp/default.nix +++ b/pkgs/applications/misc/openlp/default.nix @@ -1,6 +1,6 @@ # This file contains all runtime glue: Bindings to optional runtime dependencies # for pdfSupport, presentationSupport, and media playback. -{ lib, mkDerivation, wrapGAppsHook, python3Packages +{ lib, mkDerivation, wrapGAppsHook3, python3Packages # qt deps , qtbase, qtmultimedia @@ -40,7 +40,7 @@ in mkDerivation { pname = baseLib.pname + lib.optionalString (pdfSupport && presentationSupport && vlcSupport && gstreamerSupport) "-full"; inherit (baseLib) version src; - nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook ]; + nativeBuildInputs = [ python3Packages.wrapPython wrapGAppsHook3 ]; buildInputs = [ qtbase ] ++ optionals gstreamerSupport ([ qtmultimedia.bin gst_all_1.gstreamer ] ++ gstPlugins gst_all_1); propagatedBuildInputs = optional pdfSupport mupdf diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index e53cc20874ba6..0ab84ea083720 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -4,7 +4,7 @@ , cmake , pkg-config , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , jansson , libgcrypt , libzip @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/oversteer/default.nix b/pkgs/applications/misc/oversteer/default.nix index eb47b4225d87d..6618d154cdda5 100644 --- a/pkgs/applications/misc/oversteer/default.nix +++ b/pkgs/applications/misc/oversteer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, gettext, python3, python3Packages , meson, ninja, udev, appstream, appstream-glib, desktop-file-utils, gtk3 -, wrapGAppsHook, gobject-introspection, bash, }: +, wrapGAppsHook3, gobject-introspection, bash, }: let python = python3.withPackages (p: with p; [ @@ -33,7 +33,7 @@ in stdenv.mkDerivation { pkg-config gettext python - wrapGAppsHook + wrapGAppsHook3 gobject-introspection meson udev diff --git a/pkgs/applications/misc/pattypan/default.nix b/pkgs/applications/misc/pattypan/default.nix index c1f5aa84b0eb5..344540e848635 100644 --- a/pkgs/applications/misc/pattypan/default.nix +++ b/pkgs/applications/misc/pattypan/default.nix @@ -4,7 +4,7 @@ , ant , jdk , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , makeDesktopItem , copyDesktopItems , stripJavaArchivesHook @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ant jdk makeWrapper - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems stripJavaArchivesHook ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 78151061700aa..bfb240e2b9d21 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook, gobject-introspection }: +{ lib, fetchFromGitHub, pkgs, python3, wrapGAppsHook3, gobject-introspection }: python3.pkgs.buildPythonApplication { pname = "pdf-quench"; @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication { sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = with pkgs; [ gtk3 goocanvas2 diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 2973a4b9a36cd..7e0dc4c2fdb2c 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages , gtk3 , poppler_gi @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ] ++ (with python3Packages; [ setuptools ]); @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { python-dateutil ]; - # incompatible with wrapGAppsHook + # incompatible with wrapGAppsHook3 strictDeps = false; dontWrapGApps = true; preFixup = '' diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 7d46836b796e4..5b77a264ed2bf 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, gobject-introspection, wrapGAppsHook3 , qrencode, webkitgtk, discount, json-glib, fetchpatch }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmake pkg-config vala # For setup hook gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index 0d1e5e5f737cc..520131f991fd5 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook, glib }: +{ lib, stdenv, makeDesktopItem, fetchurl, jdk21, wrapGAppsHook3, glib }: stdenv.mkDerivation rec { pname = "pdfsam-basic"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { tar xvf data.tar.gz ''; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ wrapGAppsHook3 ]; buildInputs = [ glib ]; preFixup = '' diff --git a/pkgs/applications/misc/pdfslicer/default.nix b/pkgs/applications/misc/pdfslicer/default.nix index ed20f460a1677..d856dfaca8cb3 100644 --- a/pkgs/applications/misc/pdfslicer/default.nix +++ b/pkgs/applications/misc/pdfslicer/default.nix @@ -5,7 +5,7 @@ , gettext , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gtkmm3 , libuuid , poppler @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gettext intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index deccbabe3fd47..d999744bdb89f 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook3 , libinput , gnome , gnome-desktop @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index fb3226e6d8030..69be975be0ba2 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -21,7 +21,7 @@ , file , gnome-menus , libgee -, wrapGAppsHook +, wrapGAppsHook3 , autoreconfHook }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libxml2 # xmllint pkg-config vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 0b4f445c00669..4f12fb470671e 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -26,7 +26,7 @@ # needed for avoiding crash on file selector , gsettings-desktop-schemas , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -79,7 +79,7 @@ in stdenv.mkDerivation { ./0001-fix-locale.patch ]; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; preBuild = '' makeFlagsArray+=(PYTHON="python -m py_compile") diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 983dc81d1790d..1e29c225f92c4 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -3,7 +3,7 @@ , makeWrapper , fetchurl , dpkg -, wrapGAppsHook +, wrapGAppsHook3 , autoPatchelfHook , gtk3 , cairo @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook makeWrapper dpkg diff --git a/pkgs/applications/misc/polar-bookshelf1/default.nix b/pkgs/applications/misc/polar-bookshelf1/default.nix index a4ff885a71b8a..572a981b4ccf8 100644 --- a/pkgs/applications/misc/polar-bookshelf1/default.nix +++ b/pkgs/applications/misc/polar-bookshelf1/default.nix @@ -36,7 +36,7 @@ , nss , openssl , pango -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl libnghttp2 ]; diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index f940f5a4af803..9ed291c79c7eb 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -10,7 +10,7 @@ , sassc , python3Packages , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , libappindicator-gtk3 , libxcb , qt5 @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { meson ninja sassc - wrapGAppsHook + wrapGAppsHook3 qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index f621d510e411d..876c4c33de28e 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems +{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook3, fetchurl, copyDesktopItems , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 61acdd32857cb..884ce49dd8347 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook }: +{ lib, python3Packages, fetchFromGitHub, glib, wrapGAppsHook3 }: python3Packages.buildPythonApplication rec { pname = "printrun"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { sed -i -r "s|/usr(/local)?/share/|$out/share/|g" printrun/utils.py ''; - nativeBuildInputs = [ glib wrapGAppsHook ]; + nativeBuildInputs = [ glib wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 7952eadea68fa..b1e2a80617bae 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , boost , cereal , cgal @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 6d907fab0db46..49be94cc2baba 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -13,7 +13,7 @@ , sqlite , tzdata , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run }: @@ -48,7 +48,7 @@ in python.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index ff0ba6c0edb7a..f0c46f8c207a8 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -33,7 +33,7 @@ let intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 wrapPython gobject-introspection python diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 05daa180d0297..902ae57492011 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -13,7 +13,7 @@ , gsettings-desktop-schemas , desktop-file-utils , pantheon -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "regextester"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/remontoire/default.nix b/pkgs/applications/misc/remontoire/default.nix index 0aabaababf6a5..754d32617e789 100644 --- a/pkgs/applications/misc/remontoire/default.nix +++ b/pkgs/applications/misc/remontoire/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils ]; diff --git a/pkgs/applications/misc/rofi-top/default.nix b/pkgs/applications/misc/rofi-top/default.nix index 328eca9da894f..877cbd6a284ef 100644 --- a/pkgs/applications/misc/rofi-top/default.nix +++ b/pkgs/applications/misc/rofi-top/default.nix @@ -8,7 +8,7 @@ , libgtop , pkg-config , rofi-unwrapped -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { autoreconfHook gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 2f98fe164161b..f8da5074b52aa 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,4 +1,4 @@ -{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, wrapGAppsHook3, gdk-pixbuf, hicolor-icon-theme, theme ? null, plugins ? [], symlink-dmenu ? false }: symlinkJoin { name = "rofi-${rofi-unwrapped.version}"; @@ -7,7 +7,7 @@ symlinkJoin { rofi-unwrapped.out ] ++ (lib.forEach plugins (p: p.out)); - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook3 ]; buildInputs = [ gdk-pixbuf ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/rootbar/default.nix b/pkgs/applications/misc/rootbar/default.nix index 41582e1b413c2..2ef92f1c9aa21 100644 --- a/pkgs/applications/misc/rootbar/default.nix +++ b/pkgs/applications/misc/rootbar/default.nix @@ -7,7 +7,7 @@ , json_c , libpulseaudio , wayland -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkg-config wrapGAppsHook + meson ninja pkg-config wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 39bb82aaaef6d..87925d732e89a 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -11,7 +11,7 @@ , testers , xprintidle , xprop -, wrapGAppsHook +, wrapGAppsHook3 }: with python3.pkgs; @@ -30,7 +30,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 49fa61270b4d2..aa76a65a17523 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook3, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-MsHHTYERe0v+u3KnVtx+jmJTKORJTJ7bNfJMZHV9Ly4="; }; - nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook3 python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/pkgs/applications/misc/shipments/default.nix b/pkgs/applications/misc/shipments/default.nix index 792f997c5f850..1bcb2e4e104f4 100644 --- a/pkgs/applications/misc/shipments/default.nix +++ b/pkgs/applications/misc/shipments/default.nix @@ -9,7 +9,7 @@ , pkg-config , python3 , stdenv -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/siglo/default.nix b/pkgs/applications/misc/siglo/default.nix index 1231d2fd47fd9..2aeedcc25b2b6 100644 --- a/pkgs/applications/misc/siglo/default.nix +++ b/pkgs/applications/misc/siglo/default.nix @@ -4,7 +4,7 @@ , glib , meson , ninja -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , gobject-introspection , gtk3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { glib meson ninja - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.wrapPython python3 desktop-file-utils diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix index 116c5096cb599..4442e79944ac1 100644 --- a/pkgs/applications/misc/skytemple/default.nix +++ b/pkgs/applications/misc/skytemple/default.nix @@ -4,7 +4,7 @@ , gtk3 , gtksourceview4 , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , python3Packages }: @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 6695f53e99327..102dc8f4b3c8d 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, makeWrapper -, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook +, makeDesktopItem, which, perlPackages, boost, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cf0QTOzhLyTcbJryCQoTVzU8kfrPV6SLpqi4s36X5N0="; }; - nativeBuildInputs = [ makeWrapper which wrapGAppsHook ]; + nativeBuildInputs = [ makeWrapper which wrapGAppsHook3 ]; buildInputs = [boost] ++ (with perlPackages; [ perl diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 351a17c5fc4d2..dc5fe5993f4f7 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook, fetchurl +{ lib, stdenv, autoPatchelfHook, makeDesktopItem, copyDesktopItems, wrapGAppsHook3, fetchurl , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups , gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook - wrapGAppsHook + wrapGAppsHook3 copyDesktopItems ]; diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index c82b0813f78ba..8029eee15f896 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook3, gtksourceview3, snapper , gobject-introspection }: @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13j4spbi9pxg69zifzai8ifk4207sn0vwh6vjqryi0snd5sylh7h"; }; - nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; + nativeBuildInputs = [ wrapGAppsHook3 gobject-introspection ]; buildInputs = [ python3 diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index f3cd458510b35..8d59db378728c 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -3,7 +3,7 @@ , gobject-introspection , gtk3 , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , libappindicator , librsvg @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gdk-pixbuf gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 9e9df71ddf9ac..423944cafb1fa 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, wrapGAppsHook +, wrapGAppsHook3 , cinnamon , glib , gspell @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja python3.pkgs.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/streamdeck-ui/default.nix b/pkgs/applications/misc/streamdeck-ui/default.nix index f46be1a24324b..f8ecf3694e511 100644 --- a/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/pkgs/applications/misc/streamdeck-ui/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , writeText , makeDesktopItem -, wrapGAppsHook +, wrapGAppsHook3 , xvfb-run , qt6 }: @@ -71,7 +71,7 @@ python3Packages.buildPythonApplication rec { python3Packages.poetry-core copyDesktopItems qt6.wrapQtAppsHook - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 6f2098ea4778b..2bb4184b4353b 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -14,7 +14,7 @@ , pkg-config , proj , python3 -, wrapGAppsHook +, wrapGAppsHook3 , wxGTK32 }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { perl pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index b0cfc24aab655..cb56e4281da06 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -11,7 +11,7 @@ , scdoc , libnotify , glib -, wrapGAppsHook +, wrapGAppsHook3 , hicolor-icon-theme }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { hash = "sha256-/XPvy98Il4i8cDl9vH6f0/AZmiSqseSXnen7HfMqCDo="; }; - nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; + nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook3 ]; buildInputs = [ cairo pango gtk libnotify wayland glib hicolor-icon-theme diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index b22c483f61779..d2e055a2842ef 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , testers -, wrapGAppsHook +, wrapGAppsHook3 , bash-completion , dbus , dbus-glib @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: rec { sassc scdoc vala - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/swaysettings/default.nix b/pkgs/applications/misc/swaysettings/default.nix index babd312d3edde..490f0048081e5 100644 --- a/pkgs/applications/misc/swaysettings/default.nix +++ b/pkgs/applications/misc/swaysettings/default.nix @@ -22,7 +22,7 @@ , python3 , stdenv , vala -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config python3 vala - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 94dc95a466cd4..096f0589baedf 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook, libusb1, hidapi, udev, pkg-config }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config glib # for glib-compile-resources - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/themechanger/default.nix b/pkgs/applications/misc/themechanger/default.nix index 652fe267852a9..e1c26828c97ee 100644 --- a/pkgs/applications/misc/themechanger/default.nix +++ b/pkgs/applications/misc/themechanger/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , desktop-file-utils , glib , gtk3 @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 desktop-file-utils gtk3 ]; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index ac50a46fde6db..18aa389ac1e7c 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -20,7 +20,7 @@ , libpthreadstubs , libXdmcp , libstartup_notification -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { pkg-config cmake gettext - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/tuhi/default.nix b/pkgs/applications/misc/tuhi/default.nix index b3334c59c4a0a..759ad401ede6c 100644 --- a/pkgs/applications/misc/tuhi/default.nix +++ b/pkgs/applications/misc/tuhi/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , fetchFromGitHub }: @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ pkg-config meson ninja appstream-glib desktop-file-utils - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; buildInputs = [ diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 94ea64d3792bb..7df3f1d23b9cc 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -9,7 +9,7 @@ , librsvg , python3 , udisks2 -, wrapGAppsHook +, wrapGAppsHook3 , testers , udiskie }: @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection installShellFiles python3.pkgs.setuptools - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 080e96359e5ad..9c455fa6ba729 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -7,7 +7,7 @@ , gnome , gobject-introspection , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , webkitgtk , libnotify , keybinder3 @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { distutils-extra gobject-introspection intltool - wrapGAppsHook + wrapGAppsHook3 gdk-pixbuf ]; diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix index e1cf49f61aec5..6375b2537258d 100644 --- a/pkgs/applications/misc/upwork/default.nix +++ b/pkgs/applications/misc/upwork/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, dpkg, wrapGAppsHook, autoPatchelfHook +{ lib, stdenv, requireFile, dpkg, wrapGAppsHook3, autoPatchelfHook , alsa-lib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11, libxcb , libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg - wrapGAppsHook + wrapGAppsHook3 autoPatchelfHook ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index e26496718f39c..e90a8e9a1e01c 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -10,7 +10,7 @@ , librsvg , python3 , runtimeShell -, wrapGAppsHook +, wrapGAppsHook3 , fehSupport ? false , feh , imagemagickSupport ? true @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ intltool - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 66aca8645adca..a7b0eed9037b0 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -13,7 +13,7 @@ , ntfs3g , btrfs-progs , pcsclite -, wrapGAppsHook +, wrapGAppsHook3 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook ]; + nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook3 ]; buildInputs = [ fuse lvm2 wxGTK pcsclite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 8a987ed24672e..1335d950405fb 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch , desktopToDarwinBundle -, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook, yelp-tools +, docbook_xml_dtd_45, docbook_xsl, intltool, itstool, libxslt, pkg-config, wrapGAppsHook3, yelp-tools , curl, gdk-pixbuf, gtk3, json-glib, libxml2 , gpsbabel , withGeoClue ? true, geoclue2 @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook yelp-tools ] + nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl intltool itstool libxslt pkg-config wrapGAppsHook3 yelp-tools ] ++ lib.optional stdenv.isDarwin desktopToDarwinBundle; buildInputs = [ curl gdk-pixbuf gtk3 json-glib libxml2 ] diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index b54df7e951689..3ca9c91859a17 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchpatch , pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg -, dbus-glib, autoreconfHook, wrapGAppsHook }: +, dbus-glib, autoreconfHook, wrapGAppsHook3 }: stdenv.mkDerivation { pname = "volnoti-unstable"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook3 ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix index 36f79865d31ad..2722d8782fb4d 100644 --- a/pkgs/applications/misc/waypaper/default.nix +++ b/pkgs/applications/misc/waypaper/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , killall }: @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 30e7072644f39..fc124c56eb569 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -6,7 +6,7 @@ , ninja , wayland , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , installShellFiles }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { vc = "hg"; }; - nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook installShellFiles ]; + nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook3 installShellFiles ]; buildInputs = [ wayland gtk3 ]; patches = [ diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index c4a5e692cfcac..ebe09f8b861c2 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , autoconf , autoconf-archive , automake @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { intltool libtool pkg-config - wrapGAppsHook + wrapGAppsHook3 jinja2 gobject-introspection ]; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 3429e80f0540e..68daf189fc9b2 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xorg, pkg-config , cmake, libevdev -, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook +, gtkSupport ? true, gtk3, pcre, glib, wrapGAppsHook3 , fltkSupport ? true, fltk , qtSupport ? true, qt5 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libevdev xorg.libXtst ] - ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook ] + ++ lib.optionals gtkSupport [ gtk3 pcre glib wrapGAppsHook3 ] ++ lib.optionals fltkSupport [ fltk ] ++ lib.optionals qtSupport [ qt5.qtbase qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 130b97189a626..f2953805ff29c 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -6,7 +6,7 @@ , pango , python3Packages , txt2tags -, wrapGAppsHook +, wrapGAppsHook3 , gitUpdater }: @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection txt2tags - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 994127baca6d0..83690f129bffa 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -23,7 +23,7 @@ , pkg-config , sword , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , yelp-tools , zip }: @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { itstool libxslt pkg-config - wrapGAppsHook + wrapGAppsHook3 yelp-tools # for yelp-build zip # for building help epubs ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index e282d84f9c931..6f99290c517a8 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , intltool , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , enchant , gdk-pixbuf , glib @@ -29,7 +29,7 @@ stdenv.mkDerivation { autoreconfHook intltool pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 13b29491bf3f7..d945ae7ff0baa 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkg-config, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook3 , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook intltool ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 intltool ]; buildInputs = [ glib gtk3 gtksourceview ]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 3b529c18f52dc..8b452c7f1a40c 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook, pkg-config, gitUpdater +{ lib, stdenv, fetchFromGitLab, meson, ninja, wrapGAppsHook3, pkg-config, gitUpdater , appstream-glib, json-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils python3.pythonOnBuildForHost.pkgs.sphinx - gettext wrapGAppsHook libxml2 appstream-glib + gettext wrapGAppsHook3 libxml2 appstream-glib ]; buildInputs = [ |