summary refs log tree commit diff
path: root/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
diff options
context:
space:
mode:
authorPatrick Chilton <chpatrick@gmail.com>2022-12-28 06:05:03 +0100
committerPatrick Chilton <chpatrick@gmail.com>2022-12-28 06:05:59 +0100
commit800d3b75f05ab8157480c836deb0b49909522526 (patch)
tree96e44857b414903ff69376cf013ef17942d4bd12 /pkgs/desktops/gnome/misc/gnome-flashback/default.nix
parent57dbff4228a9d8fba7aedf439ffdd841a2326427 (diff)
downloadnixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar.gz
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar.bz2
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar.lz
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar.xz
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.tar.zst
nixpkgs-800d3b75f05ab8157480c836deb0b49909522526.zip
gnome.gnome-flashback: fix crash on start due to not finding .desktops
Diffstat (limited to 'pkgs/desktops/gnome/misc/gnome-flashback/default.nix')
-rw-r--r--pkgs/desktops/gnome/misc/gnome-flashback/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
index cdebb3628ba..6bb3484ed24 100644
--- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
@@ -180,9 +180,11 @@ let
             dontWrapGApps = true; # We want to do the wrapping ourselves.
 
             # 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}" \
+                --add-flags "--session=gnome-flashback-${wmName} --builtin" \
                 --set-default XDG_CURRENT_DESKTOP 'GNOME-Flashback:GNOME' \
                 --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" ([ wmApplication gnomeSession gnome-flashback ] ++ lib.optional enableGnomePanel gnome-panel)}' \
                 "''${gappsWrapperArgs[@]}" \