foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-31 04:58:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

programs/gnome-session: improve desktop session build step

Browse Source
This commit is contained in:
Gabriel Arazas 2024-01-02 16:17:16 +08:00
parent 3331c03a08
commit 72449a9322
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/nixos/programs/gnome-session/default.nix
View File

@ -293,13 +293,13 @@ let
(_: component: component.id) (_: component: component.id)
config.components; config.components;
gnomeSession = pkgs.writeText "${name}-gnome-session" '' gnomeSession = ''
[GNOME Session] [GNOME Session]
Name=${config.fullName} session Name=${config.fullName} session
RequiredComponents=${lib.concatStringsSep ";" requiredComponents}; RequiredComponents=${lib.concatStringsSep ";" requiredComponents};
''; '';
waylandSession = pkgs.writeText "${name}-wayland-session" '' waylandSession = ''
[Desktop Entry] [Desktop Entry]
Name=${config.fullName} Name=${config.fullName}
Comment=${config.description} Comment=${config.description}
@ -307,30 +307,36 @@ let
Type=Application Type=Application
''; '';
sessionScript = pkgs.writeShellScript "${name}-session" '' sessionScript = ''
#!${pkgs.runtimeShell}
# gnome-session is also looking for RequiredComponents in here. # gnome-session is also looking for RequiredComponents in here.
XDG_CONFIG_DIRS=@out@/etc/xdg$${XDG_CONFIG_DIRS:-:$XDG_CONFIG_DIRS} XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:-:$XDG_CONFIG_DIRS}
# We'll have to force gnome-session to detect our session. # We'll have to force gnome-session to detect our session.
XDG_DATA_DIRS=@out@/share$${XDG_DATA_DIRS:-:$XDG_DATA_DIRS} XDG_DATA_DIRS=@out@/share''${XDG_DATA_DIRS:-:$XDG_DATA_DIRS}
${lib.getExe' cfg.package "gnome-session"} ${lib.escapeShellArgs config.extraArgs} --session=${name} ${lib.getExe' cfg.package "gnome-session"} ${lib.escapeShellArgs config.extraArgs}
''; '';
in in
pkgs.runCommandLocal "${name}-gnome-session" pkgs.runCommandLocal "${name}-desktop-session-files"
{ passthru.providedSessions = [ name ]; } {
inherit waylandSession gnomeSession sessionScript;
passAsFile = [ "waylandSession" "gnomeSession" "sessionScript" ];
passthru.providedSessions = [ name ];
}
'' ''
SESSION_SCRIPT="$out/libexec/${name}-session" SESSION_SCRIPT="$out/libexec/${name}-session"
GNOME_SESSION_FILE="$out/share/gnome-session/sessions/${name}.session" GNOME_SESSION_FILE="$out/share/gnome-session/sessions/${name}.session"
WAYLAND_SESSION_FILE="$out/share/wayland-sessions/${name}.desktop" WAYLAND_SESSION_FILE="$out/share/wayland-sessions/${name}.desktop"
install -Dm0755 "${sessionScript}" "$SESSION_SCRIPT" install -Dm0755 "$sessionScriptPath" "$SESSION_SCRIPT"
substituteAllInPlace "$SESSION_SCRIPT" substituteAllInPlace "$SESSION_SCRIPT"
install -Dm0644 "${gnomeSession}" "$GNOME_SESSION_FILE" install -Dm0644 "$gnomeSessionPath" "$GNOME_SESSION_FILE"
substituteAllInPlace "$GNOME_SESSION_FILE" substituteAllInPlace "$GNOME_SESSION_FILE"
install -Dm0644 "${waylandSession}" "$WAYLAND_SESSION_FILE" install -Dm0644 "$waylandSessionPath" "$WAYLAND_SESSION_FILE"
substituteAllInPlace "$WAYLAND_SESSION_FILE" substituteAllInPlace "$WAYLAND_SESSION_FILE"
${lib.concatStringsSep "\n" installDesktops} ${lib.concatStringsSep "\n" installDesktops}