From 9dddc116d5153f0105150b53ff5558766d0e773a Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 5 Apr 2024 22:37:35 +0800 Subject: treewide: replace wrapGAppsHook with wrapGAppsHook4 for gtk4 apps --- pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix | 6 ++++-- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 81bec81cb41e2..5a6cab8177a9f 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -4,7 +4,7 @@ , pkg-config , gettext , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook4 , gjs , glib , gtk4 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meson ninja gobject-introspection - wrapGAppsHook + wrapGAppsHook4 python3 desktop-file-utils ]; @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/meson_post_install.py + substituteInPlace build-aux/meson_post_install.py \ + --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' patchShebangs build-aux/meson_post_install.py ''; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index eafbc79545f32..2042eede7c113 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -62,7 +62,7 @@ , libepoxy , gnome-user-share , gnome-remote-desktop -, wrapGAppsHook +, wrapGAppsHook4 , xvfb-run }: @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config python3 shared-mime-info - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ -- cgit 1.4.1