From 4ea1c7450a4e14b390ef08f43dc2e64074a6b128 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 13:32:40 -0400 Subject: [PATCH 1/7] pods: switch to wrapGAppsHook4 --- pkgs/applications/virtualization/pods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/pods/default.nix b/pkgs/applications/virtualization/pods/default.nix index 10af8fe502ca..cb4cea09ec2c 100644 --- a/pkgs/applications/virtualization/pods/default.nix +++ b/pkgs/applications/virtualization/pods/default.nix @@ -8,7 +8,7 @@ , ninja , pkg-config , rustPlatform -, wrapGAppsHook +, wrapGAppsHook4 , gtksourceview5 , libadwaita }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustPlatform.rust.cargo rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ From 681bc21924acdec47a4ccd619719c54139583916 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 13:53:38 -0400 Subject: [PATCH 2/7] spot: switch to wrapGAppsHook4 --- pkgs/applications/audio/spot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index e995f8cfa1b9..af1dfb01e9ae 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -16,7 +16,7 @@ , openssl , alsa-lib , libpulseaudio -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { rustPlatform.rust.cargo rustPlatform.cargoSetupHook rustPlatform.rust.rustc - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x build-aux/cargo.sh patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; passthru = { From 20e594d00505c561cddec4f08a849e6b43b86b9e Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 14:00:48 -0400 Subject: [PATCH 3/7] showmethekey: switch to wrapGAppsHook4 --- pkgs/applications/video/showmethekey/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/showmethekey/default.nix b/pkgs/applications/video/showmethekey/default.nix index 219010eeb393..d50b7ababfa7 100644 --- a/pkgs/applications/video/showmethekey/default.nix +++ b/pkgs/applications/video/showmethekey/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , glib , meson , ninja @@ -10,10 +11,11 @@ , pango , libinput , gtk4 -, wrapGAppsHook +, wrapGAppsHook4 , libxkbcommon , pkg-config }: + stdenv.mkDerivation rec { pname = "showmethekey"; version = "1.7.3"; @@ -25,6 +27,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; }; + patches = [ + (fetchpatch { + name = "use-gtk4-update-icon-cache.patch"; + url = "https://github.com/alynxzhou/showmethekey/commit/c73102dc2825d00cbaf323fcfc96736381dc67ae.patch"; + sha256 = "sha256-6QDY5eQ9A8q3LZeD7v6WI/4vYXc/XXVY/WENA1nvIKo="; + }) + ]; + nativeBuildInputs = [ glib meson @@ -36,7 +46,7 @@ stdenv.mkDerivation rec { libevdev libinput libxkbcommon - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ From 9f723885c698e9f82065a8b0e83a8b7ebf286318 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 14:06:41 -0400 Subject: [PATCH 4/7] iwgtk: switch to wrapGAppsHook4 --- pkgs/tools/networking/iwgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iwgtk/default.nix b/pkgs/tools/networking/iwgtk/default.nix index ef220a8c28e2..c2781fbaf797 100644 --- a/pkgs/tools/networking/iwgtk/default.nix +++ b/pkgs/tools/networking/iwgtk/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , scdoc -, wrapGAppsHook +, wrapGAppsHook4 , gtk4 , qrencode }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # patch systemd service to pass necessary environments and use absolute paths patches = [ ./systemd-service.patch ]; - nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wrapGAppsHook4 ]; buildInputs = [ gtk4 qrencode ]; From 8f365ed1da80c18c492fd0f586eb994b854bf543 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 14:13:52 -0400 Subject: [PATCH 5/7] czkawka: switch to wrapGAppsHook4 --- pkgs/tools/misc/czkawka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index fce125b35cd5..67ceb8fc37ff 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -8,7 +8,7 @@ , gdk-pixbuf , atk , gtk4 -, wrapGAppsHook +, wrapGAppsHook4 , gobject-introspection , xvfb-run , testers @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook4 gobject-introspection ]; From 4273a0c10d784ebc25860cc18de1afd263ea894f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 14:21:34 -0400 Subject: [PATCH 6/7] blanket: switch to wrapGAppsHook4 --- pkgs/applications/audio/blanket/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/blanket/default.nix b/pkgs/applications/audio/blanket/default.nix index 6c648ed71159..3b12aeb88684 100644 --- a/pkgs/applications/audio/blanket/default.nix +++ b/pkgs/applications/audio/blanket/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , appstream-glib , python3Packages @@ -30,9 +30,8 @@ python3Packages.buildPythonApplication rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils - appstream-glib ]; buildInputs = [ @@ -57,6 +56,8 @@ python3Packages.buildPythonApplication rec { postPatch = '' patchShebangs build-aux/meson/postinstall.py + substituteInPlace build-aux/meson/postinstall.py \ + --replace gtk-update-icon-cache gtk4-update-icon-cache ''; meta = with lib; { From 02204ec825b36b2c9f7b4312dfe4da9175a85102 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 9 Oct 2022 14:28:17 -0400 Subject: [PATCH 7/7] image-roll: switch to wrapGAppsHook4, fix typo --- pkgs/applications/graphics/image-roll/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix index 49cf0ff1b605..461a07837d83 100644 --- a/pkgs/applications/graphics/image-roll/default.nix +++ b/pkgs/applications/graphics/image-roll/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , glib , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gtk4 }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; - nativeBuildInputs = [ glib pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { "--skip=file_list::tests" # sometimes fails on darwin - "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" + "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" ]; postInstall = ''