From 93c6bd84af86dbcffe20054bb226a04aa08522b7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 23:35:35 +0800
Subject: [PATCH 1/2] xdg-desktop-portal-xapp: Fix missing xapp schema

This is especially a problem on non-Cinnamon desktops (we have xapp
in cinnamon-gsettings-overrides packaging).
---
 pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index bcb6d2d44c48..93cdd25fe14f 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -11,8 +11,8 @@
   gtk3,
   gsettings-desktop-schemas,
   mate,
-  xdg-desktop-portal,
   xapp,
+  xdg-desktop-portal,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     gtk3
     gsettings-desktop-schemas # org.gnome.system.location
     mate.mate-desktop # org.mate.background
+    xapp # org.x.apps.portal
     xdg-desktop-portal
   ];
 

From 7cf8504f793408cf76fafe5638f6db1bf6fa2435 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 23:46:42 +0800
Subject: [PATCH 2/2] xapp: Wrap xapp-sn-watcher

This is an executable.
---
 pkgs/by-name/xa/xapp/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index 5fffab2ae0a8..b0453410b136 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -96,6 +96,10 @@ stdenv.mkDerivation rec {
   # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
   env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
 
+  preFixup = ''
+    wrapGApp $out/lib/xapps/xapp-sn-watcher
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/xapp";
     description = "Cross-desktop libraries and common resources";