From 4d637cc249954bd40933d087f6fa3cc3d088f63d Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Mon, 21 Aug 2023 21:36:20 +0800
Subject: [PATCH] workflows/mosey-branch/desktop-session: fix build config

---
 .../config/desktop-session/meson.build             | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

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 87d5cf26..0e084ddd 100644
--- a/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
+++ b/modules/nixos/workflows/mosey-branch/config/desktop-session/meson.build
@@ -11,8 +11,7 @@ datadir = join_paths(prefix, get_option('datadir'))
 systemddir = join_paths(datadir, 'systemd')
 applicationsdir = join_paths(datadir, 'applications')
 systemduserdir = join_paths(systemddir, 'user')
-gsd_schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-autostartdir = join_paths(gsd_schemadir, 'etc', 'autostart')
+autostartdir = join_paths(prefix, 'etc', 'xdg', 'autostart')
 unit_name_template = app_id + '.@0@.@1@'
 
 required_components = {
@@ -20,10 +19,6 @@ required_components = {
     'description': 'Authentication agent for the desktop service',
     'script': get_option('polkit_script'),
   },
-  'ibus': {
-    'description': 'Input method engine for the desktop service',
-    'script': get_option('ibus_script'),
-  },
   'ags': {
     'description': 'Widget system',
     'script': get_option('ags_script'),
@@ -63,7 +58,8 @@ configure_file(
   install: true,
 )
 
-# Installing the core systemd units for the desktop session.
+# Installing the core systemd units for the desktop session. This is both for
+# the systemd- and non-systemd-managed GNOME sessions.
 targetconf = configuration_data()
 targetconf.set('app_id', app_id)
 configure_file(
@@ -74,7 +70,6 @@ configure_file(
   install: true,
 )
 
-# This is both for the systemd- and non-systemd-managed GNOME sessions.
 serviceconf = configuration_data()
 serviceconf.set('script', get_option('service_script'))
 configure_file(
@@ -96,7 +91,7 @@ configure_file(
 # Setting up for installing with the core services systemd units.
 required_services = []
 foreach name, component : required_components
-  required_services += app_id + name
+  required_services += app_id + '.' + name
 endforeach
 
 gnomesessionconf = configuration_data()
@@ -113,6 +108,7 @@ configure_file(
 )
 
 runconf = configuration_data()
+runconf.set('prefix', prefix)
 configure_file(
   input: 'mosey-branch.bin.in',
   output: 'mosey-branch-session',