treewide: replace wrapGAppsHook with wrapGAppsHook4 for gtk4 apps

2024-04-05 22:37:35 +08:00 · 2024-04-05 22:37:35 +08:00 · 9dddc116d5
commit 9dddc116d5
parent 67e2bc0371
22 changed files with 54 additions and 46 deletions
--- 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
  '';
--- 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 = [
--- 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; {
--- 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
--- 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
--- 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
  '';

--- 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
--- 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 = [
--- 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; [
--- 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
  ];

--- 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
  ];
--- 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 = [
--- 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 = [
--- 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 = [
--- a/pkgs/by-name/au/audio-sharing/package.nix
+++ b/pkgs/by-name/au/audio-sharing/package.nix
@ -1,5 +1,6 @@
 { appstream-glib
 , cargo
+, dbus
 , desktop-file-utils
 , fetchFromGitLab
 , git
@ -16,7 +17,7 @@
 , rustPlatform
 , rustc
 , stdenv
-, wrapGAppsHook
+, wrapGAppsHook4
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "audio-sharing";
@ -46,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
    pkg-config
    python3
    rustc
-    wrapGAppsHook
+    wrapGAppsHook4
  ] ++ (with rustPlatform; [
    cargoSetupHook
  ]);
@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
    gst_all_1.gstreamer
    gtk4
    libadwaita
+    dbus
  ];

  passthru = {
--- a/pkgs/by-name/er/errands/package.nix
+++ b/pkgs/by-name/er/errands/package.nix
@ -3,7 +3,7 @@
 , python3Packages
 , gobject-introspection
 , libadwaita
-, wrapGAppsHook
+, wrapGAppsHook4
 , meson
 , ninja
 , desktop-file-utils
@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {

  nativeBuildInputs = [
    gobject-introspection
-    wrapGAppsHook
+    wrapGAppsHook4
    desktop-file-utils
    meson
    ninja
--- a/pkgs/by-name/go/goldwarden/package.nix
+++ b/pkgs/by-name/go/goldwarden/package.nix
@ -8,7 +8,7 @@
 , libfido2
 , libnotify
 , python3
-, wrapGAppsHook
+, wrapGAppsHook4
 }:

 buildGoModule rec {
@ -55,7 +55,7 @@ buildGoModule rec {
  nativeBuildInputs = [
    gobject-introspection
    python3.pkgs.wrapPython
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
--- 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
  '';

--- 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 = [
--- a/pkgs/tools/misc/szyszka/default.nix
+++ b/pkgs/tools/misc/szyszka/default.nix
@ -8,7 +8,7 @@
 , atk
 , gdk-pixbuf
 , gtk4
-, wrapGAppsHook
+, wrapGAppsHook4
 }:

 rustPlatform.buildRustPackage rec {
@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [
    pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [
--- a/pkgs/tools/networking/lxi-tools/default.nix
+++ b/pkgs/tools/networking/lxi-tools/default.nix
@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub
 , meson, ninja, cmake, pkg-config
 , liblxi, readline, lua, bash-completion
-, wrapGAppsHook
+, wrapGAppsHook4
 , glib, gtk4, gtksourceview5, libadwaita, json-glib
 , desktop-file-utils, appstream-glib
 , gsettings-desktop-schemas
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    meson ninja cmake pkg-config
-  ] ++ lib.optional withGui wrapGAppsHook;
+  ] ++ lib.optional withGui wrapGAppsHook4;

  buildInputs = [
    liblxi readline lua bash-completion
--- a/pkgs/tools/system/lact/default.nix
+++ b/pkgs/tools/system/lact/default.nix
@ -3,7 +3,7 @@
 , fetchFromGitHub
 , blueprint-compiler
 , pkg-config
-, wrapGAppsHook
+, wrapGAppsHook4
 , gdk-pixbuf
 , gtk4
 , libdrm
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
  nativeBuildInputs = [
    blueprint-compiler
    pkg-config
-    wrapGAppsHook
+    wrapGAppsHook4
  ];

  buildInputs = [