about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-10-06 17:56:38 +0800
committerBobby Rong <rjl931189261@126.com>2023-10-06 18:22:07 +0800
commit21f5cd377acbaa9c94130c4db38695d8a4fa053d (patch)
treebdb8fecdfe014e3a589e7fc8d2bc4a1f82146b51 /pkgs/desktops
parentf6345cd25941b8eb17a7e7768b9a3de0b494eb43 (diff)
downloadnixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar.gz
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar.bz2
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar.lz
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar.xz
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.tar.zst
nixlib-21f5cd377acbaa9c94130c4db38695d8a4fa053d.zip
gnome.gnome-flashback: Add mkWmApplication
Having this in environment.systemPackages shouldn't be worse than
adding as XDG_DATA_DIRS in gnome-session.
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/misc/gnome-flashback/default.nix37
1 files changed, 19 insertions, 18 deletions
diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
index fd2abf1b51fc..8e769cc6a3af 100644
--- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
@@ -128,25 +128,26 @@ let
         versionPolicy = "odd-unstable";
       };
 
+      mkWmApplication = { wmName, wmLabel, wmCommand }:
+        writeTextFile {
+          name = "gnome-flashback-${wmName}-wm";
+          destination = "/share/applications/${wmName}.desktop";
+          text = ''
+            [Desktop Entry]
+            Type=Application
+            Encoding=UTF-8
+            Name=${wmLabel}
+            Exec=${wmCommand}
+            NoDisplay=true
+            X-GNOME-WMName=${wmLabel}
+            X-GNOME-Autostart-Phase=WindowManager
+            X-GNOME-Provides=windowmanager
+            X-GNOME-Autostart-Notify=false
+          '';
+        };
+
       mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }:
         let
-          wmApplication = writeTextFile {
-            name = "gnome-flashback-${wmName}-wm";
-            destination = "/share/applications/${wmName}.desktop";
-            text = ''
-              [Desktop Entry]
-              Type=Application
-              Encoding=UTF-8
-              Name=${wmLabel}
-              Exec=${wmCommand}
-              NoDisplay=true
-              X-GNOME-WMName=${wmLabel}
-              X-GNOME-Autostart-Phase=WindowManager
-              X-GNOME-Provides=windowmanager
-              X-GNOME-Autostart-Notify=false
-            '';
-          };
-
           gnomeSession = writeTextFile {
             name = "gnome-flashback-${wmName}-gnome-session";
             destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
@@ -174,7 +175,7 @@ let
               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" [ wmApplication gnomeSession gnome-flashback ]}'
+                --prefix XDG_DATA_DIRS : '${lib.makeSearchPath "share" [ gnomeSession gnome-flashback ]}'
             '';
           };