cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Peter Hoeg 2022-08-08 10:01:27 +08:00
parent f0165512bc
commit 63de0bd0d9
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/os-specific/linux/dbus-broker/default.nix
View file

@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
hash = "sha256-PVdRyg/t6D3HjSHeap5L8AiEm39iSO5qXohLw2UAUYY=";
};
patches = [ ./paths.patch ];
nativeBuildInputs = [ docutils meson ninja pkg-config ];
buildInputs = [

27
pkgs/os-specific/linux/dbus-broker/paths.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/src/launch/launcher.c b/src/launch/launcher.c
index 5bf5cf5..06ce7f4 100644
--- a/src/launch/launcher.c
+++ b/src/launch/launcher.c
@@ -924,9 +924,7 @@ static int launcher_load_standard_session_services(Launcher *launcher, NSSCache
static int launcher_load_standard_system_services(Launcher *launcher, NSSCache *nss_cache) {
static const char *default_data_dirs[] = {
- "/usr/local/share",
- "/usr/share",
- "/lib",
+ "/run/current-system/sw/share",
NULL,
};
const char *suffix = "dbus-1/system-services";
@@ -1012,9 +1010,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);