From c3b07a052fadf19bfa6b7a26e1c12125da4ef71d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 29 Apr 2022 16:57:30 +0200
Subject: [PATCH] =?UTF-8?q?xdg-desktop-portal:=201.12.1=20=E2=86=92=201.14?=
 =?UTF-8?q?.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.14.0
https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.14.1
https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.14.2
https://github.com/flatpak/xdg-desktop-portal/releases/tag/1.14.3

icon validator re-introduced:
https://github.com/flatpak/xdg-desktop-portal/commit/0eaacbada1b7da1ae4a82ff440aaf7d58e532dd3
---
 .../libraries/xdg-desktop-portal/default.nix  | 24 +++++++++----------
 .../xdg-desktop-portal/fix-paths.patch        | 13 ----------
 2 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index a353dc7c8194..9a8bee561c11 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -5,7 +5,8 @@
 , fetchFromGitHub
 , fetchpatch
 , flatpak
-, fuse
+, fuse3
+, systemdMinimal
 , geoclue2
 , glib
 , gsettings-desktop-schemas
@@ -14,6 +15,8 @@
 , libxml2
 , nixosTests
 , pipewire
+, gdk-pixbuf
+, librsvg
 , python3
 , pkg-config
 , stdenv
@@ -24,7 +27,7 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal";
-  version = "1.12.1";
+  version = "1.14.3";
 
   outputs = [ "out" "installedTests" ];
 
@@ -32,17 +35,9 @@ stdenv.mkDerivation rec {
     owner = "flatpak";
     repo = pname;
     rev = version;
-    sha256 = "1fc3LXN6wp/zQw4HQ0Q99HUvBhynHrQi2p3s/08izuE=";
+    sha256 = "CDqTQQ8dOatOxDKR+HiVQgSJKxH6ZstskKdR84U/870=";
   };
 
-  patches = [
-    # Hardcode paths used by x-d-p itself.
-    (substituteAll {
-      src = ./fix-paths.patch;
-      inherit flatpak;
-    })
-  ];
-
   nativeBuildInputs = [
     autoreconfHook
     libxml2
@@ -54,13 +49,18 @@ stdenv.mkDerivation rec {
     acl
     dbus
     flatpak
-    fuse
+    fuse3
+    systemdMinimal # libsystemd
     glib
     gsettings-desktop-schemas
     json-glib
     libportal
     pipewire
 
+    # For icon validator
+    gdk-pixbuf
+    librsvg
+
     # For document-fuse installed test.
     (python3.withPackages (pp: with pp; [
       pygobject3
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch b/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
deleted file mode 100644
index 98e26e88b5ce..000000000000
--- a/pkgs/development/libraries/xdg-desktop-portal/fix-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/notification.c b/src/notification.c
-index 5412609..4243e98 100644
---- a/src/notification.c
-+++ b/src/notification.c
-@@ -366,7 +366,7 @@
-   int status;
-   g_autofree char *err = NULL;
-   g_autoptr(GError) error = NULL;
--  const char *icon_validator = LIBEXECDIR "/flatpak-validate-icon";
-+  const char *icon_validator = "@flatpak@/libexec/flatpak-validate-icon";
-   const char *args[6];
- 
-   if (G_IS_THEMED_ICON (icon))