git.iko.soy/typeable/nixpkgs
on master help sign in
xdg-desktop-portal: 1.2.0 -> 1.4.2

* adapt respect-path-env-var.patch to code being moved around, etc. * Add json-glib https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.4.0

commit2eb94bdbb8b2c981b3194cb5d073e4a37c42fef2 authorworldofpeace <worldofpeace@protonmail.ch> dateMon 22 Jul 2019, 16:01 (7 years ago) parent1728bc8
2 files changed+15−13
pkgs/development/libraries/xdg-desktop-portal/default.nix+4−4 pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch+11−9
pkgs/development/libraries/xdg-desktop-portal/default.nix+4−4
@@ -1,8 +1,8 @@
1−{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }:
1+{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 pname = "xdg-desktop-portal";
5− version = "1.2.0";
5+ version = "1.4.2";
66
77 outputs = [ "out" "installedTests" ];
88
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
1010 owner = "flatpak";
1111 repo = pname;
1212 rev = version;
13− sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71";
13+ sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6";
1414 };
1515
1616 patches = [
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 ];
2323
2424 nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
25− buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ];
25+ buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ];
2626
2727 doCheck = true; # XXX: investigate!
2828
pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch+11−9
@@ -1,10 +1,12 @@
1−--- a/src/xdg-desktop-portal.c
2−+++ b/src/xdg-desktop-portal.c
3−@@ -177,38 +177,50 @@
4− static void
5− load_installed_portals (void)
1+diff --git a/src/portal-impl.c b/src/portal-impl.c
2+index 4fd48ff..346da7c 100644
3+--- a/src/portal-impl.c
4++++ b/src/portal-impl.c
5+@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a,
6+ void
7+ load_installed_portals (gboolean opt_verbose)
68 {
7−- const char *portal_dir = PKGDATADIR "/portals";
9+- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals";
810- g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
911- g_autoptr(GFileEnumerator) enumerator = NULL;
1012
@@ -14,7 +16,7 @@
1416+ const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");
1517+
1618+ if (portal_dir == NULL)
17−+ portal_dir = PKGDATADIR "/portals";
19++ portal_dir = DATADIR "/portals";
1820
1921- if (enumerator == NULL)
2022- return;
@@ -56,7 +58,7 @@
5658- path = g_file_get_path (child);
5759+ name = g_file_info_get_name (info);
5860
59−- if (!register_portal (path, &error))
61+- if (!register_portal (path, opt_verbose, &error))
6062- {
6163- g_warning ("Error loading %s: %s", path, error->message);
6264- continue;
@@ -66,7 +68,7 @@
6668+ child = g_file_enumerator_get_child (enumerator, info);
6769+ path = g_file_get_path (child);
6870+
69−+ if (!register_portal (path, &error))
71++ if (!register_portal (path, opt_verbose, &error))
7072+ {
7173+ g_warning ("Error loading %s: %s", path, error->message);
7274+ continue;