workflows/mosey-branch: update session script install location

This commit is contained in:
Gabriel Arazas 2023-08-21 21:35:50 +08:00
parent 76904cfeb1
commit 285bcb29a2
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
3 changed files with 5 additions and 6 deletions

View File

@ -35,8 +35,7 @@ stdenv.mkDerivation rec {
passthru.providedSessions = [ "mosey-branch" ]; passthru.providedSessions = [ "mosey-branch" ];
postInstall = '' postInstall = ''
wrapProgram "$out/bin/mosey-branch-session" \ wrapProgram "$out/libexec/mosey-branch-session" \
--prefix XDG_DATA_DIRS : "${placeholder "out"}/share" \
--prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}" --prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}"
''; '';

View File

@ -6,7 +6,7 @@ project('mosey-branch',
app_id = 'one.foodogsquared.MoseyBranch' app_id = 'one.foodogsquared.MoseyBranch'
prefix = get_option('prefix') prefix = get_option('prefix')
bindir = join_paths(prefix, get_option('bindir')) libexecdir = join_paths(prefix, get_option('libexecdir'))
datadir = join_paths(prefix, get_option('datadir')) datadir = join_paths(prefix, get_option('datadir'))
systemddir = join_paths(datadir, 'systemd') systemddir = join_paths(datadir, 'systemd')
applicationsdir = join_paths(datadir, 'applications') applicationsdir = join_paths(datadir, 'applications')
@ -54,7 +54,7 @@ endforeach
# Installing the Wayland session desktop entry. # Installing the Wayland session desktop entry.
desktopentryconf = configuration_data() desktopentryconf = configuration_data()
desktopentryconf.set('prefix', prefix) desktopentryconf.set('libexecdir', libexecdir)
configure_file( configure_file(
input: 'mosey-branch.desktop', input: 'mosey-branch.desktop',
output: 'mosey-branch.desktop', output: 'mosey-branch.desktop',
@ -116,7 +116,7 @@ runconf = configuration_data()
configure_file( configure_file(
input: 'mosey-branch.bin.in', input: 'mosey-branch.bin.in',
output: 'mosey-branch-session', output: 'mosey-branch-session',
install_dir: bindir, install_dir: libexecdir,
configuration: runconf, configuration: runconf,
install: true, install: true,
) )

View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Name=Mosey Branch Name=Mosey Branch
Comment=foodogsquared's Hyprland-based desktop environment setup Comment=foodogsquared's Hyprland-based desktop environment setup
Exec=@prefix@/bin/mosey-branch-session Exec=@libexecdir@/mosey-branch-session
Type=Application Type=Application