From 1ffd79918c8a39979502a2b21beeb2c1b63dfba1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Wed, 8 Jan 2025 20:57:58 +0800
Subject: [PATCH] pantheon.elementary-session-settings: Use upstream session
 files

* "Secure Session" is the wayland session.
* Even I prefer the original name, upstream prefers to name session this way so :shrug:
---
 .../elementary-session-settings/default.nix   | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index 9698383abf78..166e47207030 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -19,31 +19,6 @@
 , ninja
 }:
 
-let
-  # Absolute path patched version of the upstream xsession
-  xsession = writeText "pantheon.desktop" ''
-    [Desktop Entry]
-    Name=Pantheon
-    Comment=This session provides elementary experience
-    Exec=${gnome-session}/bin/gnome-session --session=pantheon
-    TryExec=${wingpanel}/bin/io.elementary.wingpanel
-    Icon=
-    DesktopNames=Pantheon
-    Type=Application
-  '';
-
-  wayland-session = writeText "pantheon-wayland.desktop" ''
-    [Desktop Entry]
-    Name=Pantheon (Wayland)
-    Comment=This session provides elementary experience
-    Exec=${gnome-session}/bin/gnome-session --session=pantheon-wayland
-    TryExec=${wingpanel}/bin/io.elementary.wingpanel
-    Icon=
-    DesktopNames=Pantheon
-    Type=Application
-  '';
-in
-
 stdenv.mkDerivation rec {
   pname = "elementary-session-settings";
   version = "8.0.1";
@@ -86,8 +61,9 @@ stdenv.mkDerivation rec {
     cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list
 
     # absolute path patched sessions
-    substitute ${xsession} $out/share/xsessions/pantheon.desktop --subst-var out
-    substitute ${wayland-session} $out/share/wayland-sessions/pantheon-wayland.desktop --subst-var out
+    substituteInPlace $out/share/{xsessions/pantheon.desktop,wayland-sessions/pantheon-wayland.desktop} \
+      --replace-fail "Exec=gnome-session" "Exec=${gnome-session}/bin/gnome-session" \
+      --replace-fail "TryExec=io.elementary.wingpanel" "TryExec=${wingpanel}/bin/io.elementary.wingpanel"
   '';
 
   passthru = {