BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #204919 from bobby285271/pantheon

Browse source 
pantheon.elementary-feedback: 6.1.1 -> 6.1.2
This commit is contained in:
Bobby Rong 2022-12-07 18:45:46 +08:00 committed by GitHub
commit 7a886a3038
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "elementary-feedback";
version = "6.1.1";
version = "6.1.2";
src = fetchFromGitHub {
owner = "elementary";
repo = "feedback";
rev = version;
sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg=";
sha256 = "sha256-vZTc6n7SHtHTCmC/RsCibVHcj67ksbghDosHBZfOIHM=";
};
patches = [

27
pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
View file

@ -1,17 +1,20 @@
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 6fee9d3..b0eb28c 100644
index 14b0701..13638a5 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
@@ -82,6 +82,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
}
+#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) {
try {