diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix index 9643a388..a206ea77 100644 --- a/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix +++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/default.nix @@ -35,8 +35,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mosey-branch" ]; postInstall = '' - wrapProgram "$out/bin/mosey-branch-session" \ - --prefix XDG_DATA_DIRS : "${placeholder "out"}/share" \ + wrapProgram "$out/libexec/mosey-branch-session" \ --prefix PATH : "${lib.makeBinPath [ gnome.gnome-session ]}" ''; diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build b/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build index c0d241a8..87d5cf26 100644 --- a/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build +++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build @@ -6,7 +6,7 @@ project('mosey-branch', app_id = 'one.foodogsquared.MoseyBranch' 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')) systemddir = join_paths(datadir, 'systemd') applicationsdir = join_paths(datadir, 'applications') @@ -54,7 +54,7 @@ endforeach # Installing the Wayland session desktop entry. desktopentryconf = configuration_data() -desktopentryconf.set('prefix', prefix) +desktopentryconf.set('libexecdir', libexecdir) configure_file( input: 'mosey-branch.desktop', output: 'mosey-branch.desktop', @@ -116,7 +116,7 @@ runconf = configuration_data() configure_file( input: 'mosey-branch.bin.in', output: 'mosey-branch-session', - install_dir: bindir, + install_dir: libexecdir, configuration: runconf, install: true, ) diff --git a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop index d9641b52..25a460f5 100644 --- a/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop +++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/mosey-branch.desktop @@ -1,5 +1,5 @@ [Desktop Entry] Name=Mosey Branch Comment=foodogsquared's Hyprland-based desktop environment setup -Exec=@prefix@/bin/mosey-branch-session +Exec=@libexecdir@/mosey-branch-session Type=Application