From ad65c25dfb3acfe9526d05e5c66a15ee9cec5524 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 6 Oct 2023 18:34:48 +0800
Subject: [PATCH] gnome.gnome-flashback: Drop --builtin

We should be able to find the session and desktop files now.
---
 .../gnome/misc/gnome-flashback/default.nix    | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
index c908dca0540b..ceb7d8d59a3d 100644
--- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
@@ -23,7 +23,6 @@
 , upower
 , pam
 , wrapGAppsHook
-, makeWrapper
 , writeTextFile
 , xkeyboard_config
 , xorg
@@ -158,29 +157,6 @@ let
         };
 
       mkSessionForWm = { wmName, wmLabel, wmCommand }:
-        let
-          executable = stdenv.mkDerivation {
-            name = "gnome-flashback-${wmName}";
-
-            nativeBuildInputs = [ makeWrapper ];
-
-            dontUnpack = true;
-            dontConfigure = true;
-            dontBuild = true;
-            dontInstall = true;
-
-            # gnome-flashback and gnome-panel need to be added to XDG_DATA_DIRS so that their .desktop files can be found by gnome-session.
-            # We need to pass the --builtin flag so that gnome-session invokes gnome-session-binary instead of systemd.
-            # If systemd is used, it doesn't use the environment we set up here and so it can't find the .desktop files.
-            preFixup = ''
-              makeWrapper ${gnome-session}/bin/gnome-session $out \
-                --add-flags "--session=gnome-flashback-${wmName} --builtin" \
-                --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \
-                --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" [ gnome-flashback ]}'
-            '';
-          };
-
-        in
         writeTextFile
           {
             name = "gnome-flashback-${wmName}-xsession";
@@ -189,7 +165,7 @@ let
               [Desktop Entry]
               Name=GNOME Flashback (${wmLabel})
               Comment=This session logs you into GNOME Flashback with ${wmLabel}
-              Exec=${executable}
+              Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}
               TryExec=${wmCommand}
               Type=Application
               DesktopNames=GNOME-Flashback;GNOME;