From 1b2f0d579db076f383e6294f40c7f201dcde1f6c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 22 May 2025 21:17:31 +0100
Subject: [PATCH] xdg-desktop-portal: 1.20.0 -> 1.20.3

Changes:
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.1
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.2
- https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.20.3
---
 pkgs/development/libraries/xdg-desktop-portal/default.nix | 4 ++--
 .../xdg-desktop-portal/fix-icon-validation.patch          | 8 +++-----
 .../xdg-desktop-portal/fix-sound-validation.patch         | 8 +++-----
 .../libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch | 6 ++----
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 96cca8a71268..4313ac5e84fc 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal";
-  version = "1.20.0";
+  version = "1.20.3";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "flatpak";
     repo = "xdg-desktop-portal";
     tag = finalAttrs.version;
-    hash = "sha256-FHMa8fTr8qNEM5WptuMjMs/XOsvmFxi8pDaCrwJ3/ww=";
+    hash = "sha256-ntTGEsk8GlXkp3i9RtF+T7jqnNdL2GVbu05d68WVTYc=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
index 08b7a3c0b3b0..4511b20dae97 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-icon.c b/src/validate-icon.c
-index c42265b..320f028 100644
 --- a/src/validate-icon.c
 +++ b/src/validate-icon.c
 @@ -254,7 +254,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index c42265b..320f028 100644
    g_autofree char* arg_input_fd = NULL;
    char validate_icon[PATH_MAX + 1];
 @@ -276,8 +276,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
index bfc6982d2dfd..3c716d96cde7 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
@@ -1,5 +1,3 @@
-diff --git a/src/validate-sound.c b/src/validate-sound.c
-index 7348d46..8b87c78 100644
 --- a/src/validate-sound.c
 +++ b/src/validate-sound.c
 @@ -234,7 +234,7 @@ flatpak_get_bwrap (void)
@@ -12,9 +10,9 @@ index 7348d46..8b87c78 100644
    g_autoptr(GPtrArray) args = g_ptr_array_new_with_free_func (g_free);
    char validate_sound[PATH_MAX + 1];
 @@ -255,8 +255,7 @@ rerun_in_sandbox (int input_fd)
-             "--unshare-ipc",
-             "--unshare-net",
-             "--unshare-pid",
+             "--tmpfs", "/tmp",
+             "--proc", "/proc",
+             "--dev", "/dev",
 -            "--ro-bind", "/usr", "/usr",
 -            "--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
 +            "--ro-bind", "@storeDir@", "@storeDir@",
diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
index b7ca73e5afed..369dd2a860f1 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
+++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
@@ -1,5 +1,3 @@
-diff --git a/src/xdp-portal-impl.c b/src/xdp-portal-impl.c
-index 770c265..a34ca8e 100644
 --- a/src/xdp-portal-impl.c
 +++ b/src/xdp-portal-impl.c
 @@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
@@ -8,6 +6,6 @@ index 770c265..a34ca8e 100644
    portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
 +  if (portal_dir == NULL)
 +    portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR");
-   if (portal_dir == NULL)
-     portal_dir = DATADIR "/xdg-desktop-portal/portals";
+   if (portal_dir != NULL)
+     {