From 5043f6b01a39205b465045a27c6cf66f975f0207 Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Thu, 11 Jul 2024 17:30:40 +0800
Subject: [PATCH] wrapper-manager-fds/modules: force generated desktop files
 into path

`pkgs.symlinkJoin` probably doesn't like that but for now, this will do.
---
 .../modules/wrapper-manager/build.nix                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix b/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix
index ff2827eb..6eed1de4 100644
--- a/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix
+++ b/subprojects/wrapper-manager-fds/modules/wrapper-manager/build.nix
@@ -39,21 +39,21 @@
 
           mkDesktopEntries = desktopEntries:
             builtins.map (entry: pkgs.makeDesktopItem entry) desktopEntries;
+
+            desktopEntries =
+              mkDesktopEntries (lib.attrValues config.xdg.desktopEntries);
         in
           pkgs.symlinkJoin {
             name = "wrapper-manager-fds-wrapped-package";
-            paths = config.basePackages;
+            paths = desktopEntries ++ config.basePackages;
             nativeBuildInputs =
               if config.build.isBinary
               then [ pkgs.makeBinaryWrapper ]
-              else [ pkgs.makeWrapper ]
-              ++ lib.optionals (pkgs.stdenv.isLinux && config.xdg.desktopEntries != { }) [ pkgs.copyDesktopItems ];
+              else [ pkgs.makeWrapper ];
             postBuild = ''
               ${config.build.extraSetup}
               ${mkWrapBuild (lib.attrValues config.wrappers)}
             '';
-            desktopItems =
-              mkDesktopEntries (lib.attrValues config.xdg.desktopEntries);
           };
     };
   };