dbus-broker: search in /etc/dbus-1

+29
+2
pkgs/os-specific/linux/dbus-broker/default.nix
··· 48 hash = "sha256-PVdRyg/t6D3HjSHeap5L8AiEm39iSO5qXohLw2UAUYY="; 49 }; 50 51 nativeBuildInputs = [ docutils meson ninja pkg-config ]; 52 53 buildInputs = [
··· 48 hash = "sha256-PVdRyg/t6D3HjSHeap5L8AiEm39iSO5qXohLw2UAUYY="; 49 }; 50 51 + patches = [ ./paths.patch ]; 52 + 53 nativeBuildInputs = [ docutils meson ninja pkg-config ]; 54 55 buildInputs = [
+27
pkgs/os-specific/linux/dbus-broker/paths.patch
···
··· 1 + diff --git a/src/launch/launcher.c b/src/launch/launcher.c 2 + index 5bf5cf5..06ce7f4 100644 3 + --- a/src/launch/launcher.c 4 + +++ b/src/launch/launcher.c 5 + @@ -924,9 +924,7 @@ static int launcher_load_standard_session_services(Launcher *launcher, NSSCache 6 + 7 + static int launcher_load_standard_system_services(Launcher *launcher, NSSCache *nss_cache) { 8 + static const char *default_data_dirs[] = { 9 + - "/usr/local/share", 10 + - "/usr/share", 11 + - "/lib", 12 + + "/run/current-system/sw/share", 13 + NULL, 14 + }; 15 + const char *suffix = "dbus-1/system-services"; 16 + @@ -1012,9 +1010,9 @@ static int launcher_parse_config(Launcher *launcher, ConfigRoot **rootp, NSSCach 17 + if (launcher->configfile) 18 + configfile = launcher->configfile; 19 + else if (launcher->user_scope) 20 + - configfile = "/usr/share/dbus-1/session.conf"; 21 + + configfile = "/etc/dbus-1/session.conf"; 22 + else 23 + - configfile = "/usr/share/dbus-1/system.conf"; 24 + + configfile = "/etc/dbus-1/system.conf"; 25 + 26 + config_parser_init(&parser); 27 +