From fefc9af5ddf3997b27f9e60b83a8a799145ca6c3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 30 May 2026 11:09:56 -0400
Subject: [PATCH] xdg-desktop-portal: move to by-name

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../xd}/xdg-desktop-portal/fix-icon-validation.patch           | 0
 .../xd}/xdg-desktop-portal/fix-sound-validation.patch          | 0
 .../xd}/xdg-desktop-portal/installed-tests-path.patch          | 0
 .../xd}/xdg-desktop-portal/nix-pkgdatadir-env.patch            | 0
 .../default.nix => by-name/xd/xdg-desktop-portal/package.nix}  | 3 ++-
 .../xd}/xdg-desktop-portal/trash-test.patch                    | 0
 pkgs/top-level/all-packages.nix                                | 2 --
 7 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/fix-icon-validation.patch (100%)
 rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/fix-sound-validation.patch (100%)
 rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/installed-tests-path.patch (100%)
 rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/nix-pkgdatadir-env.patch (100%)
 rename pkgs/{development/libraries/xdg-desktop-portal/default.nix => by-name/xd/xdg-desktop-portal/package.nix} (97%)
 rename pkgs/{development/libraries => by-name/xd}/xdg-desktop-portal/trash-test.patch (100%)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch b/pkgs/by-name/xd/xdg-desktop-portal/fix-icon-validation.patch
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal/fix-icon-validation.patch
rename to pkgs/by-name/xd/xdg-desktop-portal/fix-icon-validation.patch
diff --git a/pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch b/pkgs/by-name/xd/xdg-desktop-portal/fix-sound-validation.patch
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal/fix-sound-validation.patch
rename to pkgs/by-name/xd/xdg-desktop-portal/fix-sound-validation.patch
diff --git a/pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch b/pkgs/by-name/xd/xdg-desktop-portal/installed-tests-path.patch
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal/installed-tests-path.patch
rename to pkgs/by-name/xd/xdg-desktop-portal/installed-tests-path.patch
diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch
rename to pkgs/by-name/xd/xdg-desktop-portal/nix-pkgdatadir-env.patch
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/by-name/xd/xdg-desktop-portal/package.nix
similarity index 97%
rename from pkgs/development/libraries/xdg-desktop-portal/default.nix
rename to pkgs/by-name/xd/xdg-desktop-portal/package.nix
index 31c4fa4a8685..fc618622942a 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal/package.nix
@@ -28,6 +28,7 @@
   gst_all_1,
   libgudev,
   umockdev,
+  zynaddsubfx,
   replaceVars,
   enableGeoLocation ? true,
   enableSystemd ? true,
@@ -193,7 +194,7 @@ stdenv.mkDerivation (finalAttrs: {
       installedTests = nixosTests.installed-tests.xdg-desktop-portal;
 
       validate-icon = runCommand "test-icon-validation" { } ''
-        ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../by-name/zy/zynaddsubfx/ZynLogo.svg} > "$out"
+        ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${finalAttrs.src}/doc/website/favicon.svg > "$out"
         grep format=svg "$out"
       '';
     };
diff --git a/pkgs/development/libraries/xdg-desktop-portal/trash-test.patch b/pkgs/by-name/xd/xdg-desktop-portal/trash-test.patch
similarity index 100%
rename from pkgs/development/libraries/xdg-desktop-portal/trash-test.patch
rename to pkgs/by-name/xd/xdg-desktop-portal/trash-test.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7ccbe0f949d..9ad1eac1c4e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10292,8 +10292,6 @@ with pkgs;
     gbmSupport = true;
   };
 
-  xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
-
   xdg-desktop-portal-hyprland =
     callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland
       {