diff options
Diffstat (limited to 'pkgs/applications')
14 files changed, 34 insertions, 30 deletions
diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index d05130de41248..965ada75d2551 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -15,7 +15,7 @@ , ninja , pkg-config , python3 -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace data/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs data/meson_post_install.py patchShebangs libparlatype/tests/data/generate_config_data ''; diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/applications/audio/zrythm/default.nix index 254e0e5b746d0..663c159d5d9b0 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/applications/audio/zrythm/default.nix @@ -64,7 +64,7 @@ , sratom , texi2html , vamp-plugin-sdk -, wrapGAppsHook +, wrapGAppsHook4 , xdg-utils , xxHash , zix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { python3.pkgs.sphinx sassc texi2html - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/display-managers/greetd/regreet.nix b/pkgs/applications/display-managers/greetd/regreet.nix index 254589c7a43ec..ff0511a15c1c3 100644 --- a/pkgs/applications/display-managers/greetd/regreet.nix +++ b/pkgs/applications/display-managers/greetd/regreet.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , glib , gtk4 , pango @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "gtk4_8" ]; - nativeBuildInputs = [ pkg-config wrapGAppsHook]; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ glib gtk4 pango librsvg ]; meta = with lib; { diff --git a/pkgs/applications/graphics/conjure/default.nix b/pkgs/applications/graphics/conjure/default.nix index 634cf7132b1d5..105b8577bd64e 100644 --- a/pkgs/applications/graphics/conjure/default.nix +++ b/pkgs/applications/graphics/conjure/default.nix @@ -3,7 +3,7 @@ , lib , libadwaita , python3Packages -, wrapGAppsHook +, wrapGAppsHook4 , meson , ninja , desktop-file-utils @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils appstream-glib meson diff --git a/pkgs/applications/graphics/curtail/default.nix b/pkgs/applications/graphics/curtail/default.nix index 2a881c153f682..d12c3e6f22614 100644 --- a/pkgs/applications/graphics/curtail/default.nix +++ b/pkgs/applications/graphics/curtail/default.nix @@ -1,7 +1,7 @@ { lib , python3 , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook4 , appstream-glib , desktop-file-utils , gettext @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook4 appstream-glib desktop-file-utils gettext diff --git a/pkgs/applications/misc/confy/default.nix b/pkgs/applications/misc/confy/default.nix index 5d9a97d95425f..89110aead938b 100644 --- a/pkgs/applications/misc/confy/default.nix +++ b/pkgs/applications/misc/confy/default.nix @@ -11,7 +11,7 @@ , pkg-config , python3 , stdenv -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -46,6 +46,8 @@ stdenv.mkDerivation (finalAttrs: { ]; postPatch = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs build-aux/meson/postinstall.py ''; diff --git a/pkgs/applications/misc/gnome-solanum/default.nix b/pkgs/applications/misc/gnome-solanum/default.nix index 4c507edfb06f1..b58d5e67d6084 100644 --- a/pkgs/applications/misc/gnome-solanum/default.nix +++ b/pkgs/applications/misc/gnome-solanum/default.nix @@ -10,7 +10,7 @@ , ninja , pkg-config , rustc -, wrapGAppsHook +, wrapGAppsHook4 , python3 , git , glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 python3 git desktop-file-utils diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix index 5d703f7d6e374..18a8f53966897 100644 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -9,7 +9,7 @@ , gobject-introspection , vulkan-tools , python3 -, wrapGAppsHook +, wrapGAppsHook4 , gdk-pixbuf , lsb-release , glxinfo @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { meson ninja gobject-introspection - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/applications/misc/plots/default.nix index 1e7db2651a106..c53a0a57beb3b 100644 --- a/pkgs/applications/misc/plots/default.nix +++ b/pkgs/applications/misc/plots/default.nix @@ -3,7 +3,7 @@ , python3Packages , gobject-introspection , libadwaita -, wrapGAppsHook +, wrapGAppsHook4 , lmmath }: @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw="; }; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook4 ]; buildInputs = [ libadwaita ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix index d61eff36081b2..413b1f3b3dafa 100644 --- a/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -8,7 +8,7 @@ , gettext , desktop-file-utils , appstream-glib -, wrapGAppsHook +, wrapGAppsHook4 , python3 # Not native , gst_all_1 @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { gettext desktop-file-utils appstream-glib - wrapGAppsHook + wrapGAppsHook4 python3 ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 258f75df4d108..19e84a5f30794 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , buildPackages -, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext +, vala, cmake, ninja, wrapGAppsHook4, pkg-config, gettext , gobject-introspection, glib, gdk-pixbuf, gtk4, glib-networking , libadwaita , libnotify, libsoup, libgee @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { cmake ninja # https://github.com/dino/dino/issues/230 pkg-config - wrapGAppsHook + wrapGAppsHook4 gettext gobject-introspection ]; diff --git a/pkgs/applications/networking/instant-messengers/tangram/default.nix b/pkgs/applications/networking/instant-messengers/tangram/default.nix index c32e55ffde4ef..c68af388f323c 100644 --- a/pkgs/applications/networking/instant-messengers/tangram/default.nix +++ b/pkgs/applications/networking/instant-messengers/tangram/default.nix @@ -20,7 +20,7 @@ , python3 , webkitgtk_6_0 , blueprint-compiler -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { pkg-config python3 blueprint-compiler - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 0872a75254fea..5b8e0078d75cf 100644 --- a/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -18,9 +18,8 @@ , libgee , callPackage , python3 -, gtk3 , desktop-file-utils -, wrapGAppsHook +, wrapGAppsHook4 , sixelSupport ? false }: @@ -48,6 +47,8 @@ stdenv.mkDerivation rec { ]; postPatch = '' + substituteInPlace build-aux/meson/postinstall.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs build-aux/meson/postinstall.py ''; @@ -57,9 +58,8 @@ stdenv.mkDerivation rec { pkg-config vala sassc - wrapGAppsHook + wrapGAppsHook4 python3 - gtk3 # For gtk-update-icon-cache desktop-file-utils # For update-desktop-database ]; buildInputs = [ diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 8e85597cc7d39..5cef1e0f9d680 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , feedbackd , gtk4 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja phosh pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ |