xdg-desktop-portal: 1.20.4 -> 1.22.1 (#544674)

nixos/tests/installed-tests/xdg-desktop-portal.nix

@@ -22,6 +22,7 @@ makeInstalledTest {
     environment.systemPackages = with pkgs; [
       umockdev
       wireless-regdb
+      bubblewrap
     ];
     services.geoclue2 = {
       enable = true;

pkgs/by-name/xd/xdg-desktop-portal/package.nix

@@ -39,13 +39,20 @@ let
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "libglnx";
-    rev = "ccea836b799256420788c463a638ded0636b1632";
-    hash = "sha256-H8Bg9QCSkt/aBOaHLyHYC2ei6OU7UpcLq8zLurkYOuA=";
+    rev = "ff64d52116ae74f0d25e24f089db28921ea171ff";
+    hash = "sha256-U6+vIU/wxnGGg07FJElQijbV0+jUswdG/lfzhw4wQy0=";
+  };
+  gvdbSrc = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "gvdb";
+    rev = "c6f2359cc1d00f16e0a0e2527fa0bc1882b8b5ab";
+    hash = "sha256-FQPctq+fj6du0sBawaJxtO0PRO0KIHHhdA2jh24Yacw=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal";
-  version = "1.20.4";
+  version = "1.22.1";
 
   outputs = [
     "out"
@@ -57,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     tag = finalAttrs.version;
-    hash = "sha256-wLQgJsVicOb8G7M5Qwd+t90UgNYTD04bZ5Ki85Alr1w=";
+    hash = "sha256-GYPc5gFw3vMiDbrw5h6xeU7wupfyWeWq/Vl+vVrX8h0=";
   };
 
   patches = [
@@ -74,9 +81,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Allow installing installed tests to a separate output.
     ./installed-tests-path.patch
-
-    # test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox
-    ./trash-test.patch
   ];
 
   nativeBuildInputs = [
@@ -128,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
       ps.dbus-python
     ]))
     umockdev
+    bubblewrap
   ];
 
   checkInputs = [ umockdev ];
@@ -151,8 +156,9 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = true;
 
   postPatch = ''
-    mkdir -p subprojects/libglnx
+    mkdir -p subprojects/{libglnx,gvdb}
     cp -r ${libglnxSrc}/* subprojects/libglnx/
+    cp -r ${gvdbSrc}/* subprojects/gvdb/
 
     # until/unless bubblewrap ships a pkg-config file, meson has no way to find it when cross-compiling.
     substituteInPlace meson.build \

pkgs/by-name/xd/xdg-desktop-portal/trash-test.patch

@@ -1,18 +0,0 @@
-diff --git a/tests/test_trash.py b/tests/test_trash.py
-index 2637256..e89d45c 100644
---- a/tests/test_trash.py
-+++ b/tests/test_trash.py
-@@ -13,13 +13,6 @@ class TestTrash:
-     def test_version(self, portals, dbus_con):
-         xdp.check_version(dbus_con, "Trash", 1)
- 
--    def test_trash_file_fails(self, portals, dbus_con):
--        trash_intf = xdp.get_portal_iface(dbus_con, "Trash")
--        with open("/proc/cmdline") as fd:
--            result = trash_intf.TrashFile(fd.fileno())
--
--        assert result == 0
--
-     def test_trash_file(self, portals, dbus_con):
-         trash_intf = xdp.get_portal_iface(dbus_con, "Trash")
-