From 094f3726d98f5eff6439c92ba19f01e4efb689b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 2 Feb 2023 09:16:49 +0000 Subject: [PATCH] =?UTF-8?q?gnome.zenity:=203.43.0=20=E2=86=92=203.44.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have not been installing icons since the Meson switch but now it caused the updated post-install script to crash: gtk-update-icon-cache: Failed to open file /nix/store/czzwa7n5yg12gvmq0xg9l9d9s1ja4280-zenity-3.44.0/share/icons/hicolor/.icon-theme.cache : No such file or directory https://gitlab.gnome.org/GNOME/zenity/-/compare/3.43.0...3.44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/zenity/default.nix | 8 ++++++-- .../gnome/core/zenity/fix-icon-install.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/gnome/core/zenity/fix-icon-install.patch diff --git a/pkgs/desktops/gnome/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix index 1bb1f4384b54..f5eb4c5e80df 100644 --- a/pkgs/desktops/gnome/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -15,13 +15,17 @@ stdenv.mkDerivation rec { pname = "zenity"; - version = "3.43.0"; + version = "3.44.0"; src = fetchurl { url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sNfKHgwYaPoY8FwhAmDYp74fCO4Tt/XP26ubYfoW+DM="; + sha256 = "wVWCMB7ZC51CzlIdvM+ZqYnyLxIEG91SecZjbamev2U="; }; + patches = [ + ./fix-icon-install.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch new file mode 100644 index 000000000000..d412cc4a5bf0 --- /dev/null +++ b/pkgs/desktops/gnome/core/zenity/fix-icon-install.patch @@ -0,0 +1,12 @@ +diff --git a/data/meson.build b/data/meson.build +index 339b3cff..aca65efd 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -9,5 +9,6 @@ install_data( + 'zenity-text.png', + 'zenity-scale.png', + 'zenity-entry.png', +- 'zenity-notification.png'] ++ 'zenity-notification.png'], ++ install_dir: zenity_prefix / get_option('datadir') / 'icons/hicolor/48x48/apps', + )