diff --git a/pkgs/by-name/db/dbus-broker/package.nix b/pkgs/by-name/db/dbus-broker/package.nix index 20a3fd102b02..d3e68660b94b 100644 --- a/pkgs/by-name/db/dbus-broker/package.nix +++ b/pkgs/by-name/db/dbus-broker/package.nix @@ -54,8 +54,8 @@ let # part of the dbus-broker project, just in separate repositories. c-dvar = dep { pname = "c-dvar"; - version = "1.1.0"; - hash = "sha256-p/C+BktclVseCtZJ1Q/YK03vP2ClnYRLB1Vmj2OQJD4="; + version = "1.2.0"; + hash = "sha256-OlV6yR1tNWFN+rxPPGmbfbh7WyB6FwORyZR1V553iYE="; buildInputs = [ c-stdaux c-utf8 @@ -91,8 +91,8 @@ let }; c-stdaux = dep { pname = "c-stdaux"; - version = "1.5.0"; - hash = "sha256-MsnuEyVCmOIr/q6I1qyPsNXp48jxIEcXoYLHbOAZtW0="; + version = "1.6.0"; + hash = "sha256-/15lop+WUkTW9v9h7BBdwRSpJgcBXaJNtMM7LXgcQE4="; }; c-utf8 = dep { pname = "c-utf8"; @@ -105,13 +105,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "dbus-broker"; - version = "36"; + version = "37"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${finalAttrs.version}"; - hash = "sha256-5dAMKjybqrHG57vArbtWEPR/svSj2ION75JrjvnnpVM="; + hash = "sha256-a9ydcJKZP8MLzu9lv40p9sTyo8IsU++9HOFeGU3+Tok="; }; patches = [ diff --git a/pkgs/by-name/db/dbus-broker/paths.patch b/pkgs/by-name/db/dbus-broker/paths.patch index 577270d30dce..726674c857eb 100644 --- a/pkgs/by-name/db/dbus-broker/paths.patch +++ b/pkgs/by-name/db/dbus-broker/paths.patch @@ -1,11 +1,11 @@ diff --git a/src/launch/launcher.c b/src/launch/launcher.c -index 5bf5cf5..06ce7f4 100644 +index 7b1fb19..6bc2c46 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) { +@@ -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", @@ -13,7 +13,7 @@ index 5bf5cf5..06ce7f4 100644 NULL, }; const char *suffix = "dbus-1/system-services"; -@@ -1012,9 +1010,9 @@ static int launcher_parse_config(Launcher *launcher, ConfigRoot **rootp, NSSCach +@@ -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)