push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,27 @@
diff --git a/src/launch/launcher.c b/src/launch/launcher.c
index 7b1fb19..6bc2c46 100644
--- a/src/launch/launcher.c
+++ b/src/launch/launcher.c
@@ -945,9 +945,7 @@ static int launcher_load_standard_system_services(Launcher *launcher, NSSCache *
static const char *default_data_dirs[] = {
"/etc",
"/run",
- "/usr/local/share",
- "/usr/share",
- "/lib",
+ "/run/current-system/sw/share",
NULL,
};
const char *suffix = "dbus-1/system-services";
@@ -1033,9 +1031,9 @@ static int launcher_parse_config(Launcher *launcher, ConfigRoot **rootp, NSSCach
if (launcher->configfile)
configfile = launcher->configfile;
else if (launcher->user_scope)
- configfile = "/usr/share/dbus-1/session.conf";
+ configfile = "/etc/dbus-1/session.conf";
else
- configfile = "/usr/share/dbus-1/system.conf";
+ configfile = "/etc/dbus-1/system.conf";
config_parser_init(&parser);