From e5bf465aca1c29df4fc8d08c83ae7c0ad3ea2f9b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 1 Oct 2025 11:15:06 +0800 Subject: [PATCH] pantheon.granite7: 7.6.0 -> 7.7.0 https://github.com/elementary/granite/compare/7.6.0...7.7.0 --- .../pantheon/libraries/granite/7/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/libraries/granite/7/default.nix b/pkgs/desktops/pantheon/libraries/granite/7/default.nix index c749c9262053..a1c65b89f474 100644 --- a/pkgs/desktops/pantheon/libraries/granite/7/default.nix +++ b/pkgs/desktops/pantheon/libraries/granite/7/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, nix-update-script, meson, ninja, @@ -10,6 +9,7 @@ vala, pkg-config, libgee, + libshumate, gtk4, glib, gettext, @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "7.6.0"; + version = "7.7.0"; outputs = [ "out" @@ -31,18 +31,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "granite"; rev = version; - sha256 = "sha256-bv2rOq16xg9lCWfcLzAFN4LjBTJBxPhXvEJzutkdYzs="; + sha256 = "sha256-ypSkzz9BaVweR1C0OkkfwDl8tehMK1S5iExL14LuKmI="; }; - patches = [ - # Init: Avoid crash with Gtk >= 4.17 - # https://github.com/elementary/granite/pull/893 - (fetchpatch { - url = "https://github.com/elementary/granite/commit/60cb8c4119b579592e6c7f3b1476e4d729f58699.patch"; - hash = "sha256-6NB/Tu3mdmiBd77SOi4twdY/HidyhMn7mNN+54iFLIc="; - }) - ]; - nativeBuildInputs = [ gettext gobject-introspection @@ -54,6 +45,10 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; + buildInputs = [ + libshumate # demo + ]; + propagatedBuildInputs = [ glib gsettings-desktop-schemas # is_clock_format_12h uses "org.gnome.desktop.interface clock-format"