tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
pantheon.elementary-feedback: 6.1.1 -> 6.1.2
Bobby Rong
3 years ago
9545b42b
fdaabfdb
+17
-14
2 changed files
expand all
collapse all
unified
split
pkgs
desktops
pantheon
apps
elementary-feedback
default.nix
fix-metadata-path.patch
+2
-2
pkgs/desktops/pantheon/apps/elementary-feedback/default.nix
···
18
18
19
19
stdenv.mkDerivation rec {
20
20
pname = "elementary-feedback";
21
21
-
version = "6.1.1";
21
21
+
version = "6.1.2";
22
22
23
23
src = fetchFromGitHub {
24
24
owner = "elementary";
25
25
repo = "feedback";
26
26
rev = version;
27
27
-
sha256 = "sha256-YLYHaFQAAeSt25xHF7xDJWhw+rbH9SpzoRoXaYP42jg=";
27
27
+
sha256 = "sha256-vZTc6n7SHtHTCmC/RsCibVHcj67ksbghDosHBZfOIHM=";
28
28
};
29
29
30
30
patches = [
+15
-12
pkgs/desktops/pantheon/apps/elementary-feedback/fix-metadata-path.patch
···
1
1
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
2
2
-
index 6fee9d3..b0eb28c 100644
2
2
+
index 14b0701..13638a5 100644
3
3
--- a/src/MainWindow.vala
4
4
+++ b/src/MainWindow.vala
5
5
-
@@ -89,6 +89,12 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
5
5
+
@@ -82,6 +82,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
6
6
+
AppStream.PoolFlags.LOAD_FLATPAK |
7
7
+
AppStream.PoolFlags.RESOLVE_ADDONS
8
8
+
);
9
9
+
+ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO);
10
10
+
#else
11
11
+
appstream_pool.clear_metadata_locations ();
12
12
+
// flatpak's appstream files exists only inside they sandbox
13
13
+
@@ -89,6 +90,7 @@ public class Feedback.MainWindow : Gtk.ApplicationWindow {
14
14
+
foreach (var app in app_entries) {
15
15
+
appstream_pool.add_metadata_location (appdata_dir.printf (app));
16
16
+
}
17
17
+
+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/");
6
18
#endif
7
7
-
}
8
19
9
9
-
+#if HAS_APPSTREAM_0_15
10
10
-
+ appstream_pool.add_extra_data_location ("/run/current-system/sw/share/metainfo/", AppStream.FormatStyle.METAINFO);
11
11
-
+#else
12
12
-
+ appstream_pool.add_metadata_location ("/run/current-system/sw/share/metainfo/");
13
13
-
+#endif
14
14
-
+
15
15
-
// flatpak's appstream files exists only inside they sandbox
16
16
-
unowned var appdata_dir = "/var/lib/flatpak/app/%s/current/active/files/share/appdata";
17
17
-
foreach (var app in app_entries) {
20
20
+
try {