From 7bbfb5ab95c40e0c5b873f9f5a8cc3b61c8dcfca Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 19 Nov 2025 07:33:53 +0800
Subject: [PATCH] pantheon.elementary-feedback: 8.0.1 -> 8.1.0

https://github.com/elementary/feedback/compare/8.0.1...8.1.0
---
 .../apps/elementary-feedback/default.nix         |  6 +++---
 .../elementary-feedback/fix-metadata-path.patch  | 16 ++++------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 37868bf85613..7613602ec31c 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-feedback";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
-    rev = version;
-    sha256 = "sha256-D0x0jKYEB6Bo8ETgVCjgdOItc+VJYlrr8N9lI/Z3eXU=";
+    tag = version;
+    hash = "sha256-FvlSfcP/Qdo9zBFm2XiEqaxYGILe4BCNPyCELS43pew=";
   };
 
   patches = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
index cc56b7e0d035..f4f00ba6bec5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
@@ -1,20 +1,12 @@
 diff --git a/src/MainWindow.vala b/src/MainWindow.vala
-index 14b0701..13638a5 100644
+index 8f407bf..32db5fb 100644
 --- a/src/MainWindow.vala
 +++ b/src/MainWindow.vala
-@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
+@@ -124,6 +124,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
              AppStream.PoolFlags.LOAD_FLATPAK |
              AppStream.PoolFlags.RESOLVE_ADDONS
          );
 +        appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO);
- #else
-         appstream_pool.clear_metadata_locations ();
-         // flatpak's appstream files exists only inside they sandbox
-@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
-         foreach (var app in app_entries) {
-             appstream_pool.add_metadata_location (appdata_dir.printf (app));
-         }
-+        appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/");
- #endif
  
-         try {
+         appstream_pool.load_async.begin (null, (obj, res) => {
+             try {