65deea6610
DBus clients working again: they expect dbus-launch in the dbus.daemon prefix, where it no longer is. Fortunately they also search in the path. But a better fix is to move dbus-launch to dbus.daemon. svn path=/nixos/trunk/; revision=10951
62 lines
1.2 KiB
Nix
62 lines
1.2 KiB
Nix
{stdenv, dbus, dbusServices ? []}:
|
|
|
|
let
|
|
|
|
homeDir = "/var/run/dbus";
|
|
|
|
# Take the standard system configuration file, except that we don't
|
|
# want to fork (Upstart will monitor the daemon).
|
|
configFile = stdenv.mkDerivation {
|
|
name = "dbus-conf";
|
|
buildCommand = "
|
|
ensureDir $out
|
|
substitute ${dbus}/etc/dbus-1/system.conf $out/system.conf \\
|
|
--replace '<fork/>' ''
|
|
|
|
ensureDir $out/system.d
|
|
for i in ${toString dbusServices}; do
|
|
ln -s $i/etc/dbus-1/system.d/* $out/system.d/
|
|
done
|
|
";
|
|
};
|
|
|
|
in
|
|
|
|
{
|
|
name = "dbus";
|
|
|
|
users = [
|
|
{ name = "messagebus";
|
|
uid = (import ../system/ids.nix).uids.messagebus;
|
|
description = "D-Bus system message bus daemon user";
|
|
home = homeDir;
|
|
}
|
|
];
|
|
|
|
extraPath = [dbus.daemon dbus.tools];
|
|
|
|
job = "
|
|
description \"D-Bus system message bus daemon\"
|
|
|
|
start on startup
|
|
stop on shutdown
|
|
|
|
start script
|
|
|
|
mkdir -m 0755 -p ${homeDir}
|
|
chown messagebus ${homeDir}
|
|
|
|
mkdir -m 0755 -p /var/lib/dbus
|
|
${dbus.tools}/bin/dbus-uuidgen --ensure
|
|
|
|
end script
|
|
|
|
respawn
|
|
|
|
script
|
|
rm -f ${homeDir}/pid
|
|
exec ${dbus}/bin/dbus-daemon --config-file=${configFile}/system.conf
|
|
end script
|
|
";
|
|
|
|
}
|