From e741166e6255f98cabc1f54731e967dc67e68cbb Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 May 2022 10:24:17 +0800
Subject: [PATCH 1/2] pantheon.elementary-feedback: 6.1.0 -> 6.1.1

---
 .../apps/elementary-feedback/default.nix         | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index f589f4234ca5..7d9b5fa1d413 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , pkg-config
 , meson
@@ -13,33 +12,22 @@
 , granite
 , libgee
 , libhandy
-, gettext
 , wrapGAppsHook
 , appstream
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-feedback";
-  version = "6.1.0";
+  version = "6.1.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "feedback";
     rev = version;
-    sha256 = "02wydbpa5qaa4xmmh4m7rbj4djbrn2i44zjakj5i6mzwjlj6sv5n";
+    sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg=";
   };
 
-  patches = [
-    # Upstream code not respecting our localedir
-    # https://github.com/elementary/feedback/pull/48
-    (fetchpatch {
-      url = "https://github.com/elementary/feedback/commit/080005153977a86d10099eff6a5b3e68f7b12847.patch";
-      sha256 = "01710i90qsaqsrjs92ahwwj198bdrrif6mnw29l9har2rncfkfk2";
-    })
-  ];
-
   nativeBuildInputs = [
-    gettext
     meson
     ninja
     pkg-config

From 874fb627c429ff4186bdc5cb70dabdd87c86a759 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 28 May 2022 12:21:51 +0800
Subject: [PATCH 2/2] pantheon.elementary-feedback: load metadata from correct
 location

---
 .../apps/elementary-feedback/default.nix        |  8 ++++++++
 .../elementary-feedback/fix-metadata-path.patch | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch

diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
index 7d9b5fa1d413..6c6113e6be92 100644
--- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
@@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg=";
   };
 
+  patches = [
+    # The standard location to the metadata pool where metadata
+    # will be read from is likely hardcoded as /usr/share/metainfo
+    # https://github.com/ximion/appstream/blob/v0.15.2/src/as-pool.c#L117
+    # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location
+    ./fix-metadata-path.patch
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
new file mode 100644
index 000000000000..20676937e0a7
--- /dev/null
+++ b/pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
@@ -0,0 +1,17 @@
+diff --git a/src/MainWindow.vala b/src/MainWindow.vala
+index 6fee9d3..b0eb28c 100644
+--- a/src/MainWindow.vala
++++ b/src/MainWindow.vala
+@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
+ #endif
+             }
+ 
++#if HAS_APPSTREAM_0_15
++            appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO);
++#else
++            appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/");
++#endif
++
+             // flatpak's appstream files exists only inside they sandbox
+             unowned var appdata_dir = "/var/lib/flatpak/app/%s/current/active/files/share/appdata";
+             foreach (var app in app_entries) {