JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22864 from abbradar/dbus-etc

Browse Source 
Redo DBus configuration
This commit is contained in:
Nikolay Amiantov 2017-02-17 11:47:51 +03:00 committed by GitHub
commit 8ecd5c4019
8 changed files with 108 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/system/dbus-session-local.conf.in
View File

@ -1,5 +0,0 @@
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
@extra@
</busconfig>

6
nixos/modules/services/system/dbus-system-local.conf.in
View File

@ -1,6 +0,0 @@
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<servicehelper>@servicehelper@</servicehelper>
@extra@
</busconfig>

30
nixos/modules/services/system/dbus.nix
View File

@ -10,32 +10,10 @@ let
homeDir = "/run/dbus";
systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [
"<servicedir>${d}/share/dbus-1/system-services</servicedir>"
"<includedir>${d}/etc/dbus-1/system.d</includedir>"
]));
sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [
"<servicedir>${d}/share/dbus-1/services</servicedir>"
"<includedir>${d}/etc/dbus-1/session.d</includedir>"
]));
configDir = pkgs.runCommand "dbus-conf"
{ preferLocalBuild = true;
allowSubstitutes = false;
}
''
mkdir -p $out
sed '${./dbus-system-local.conf.in}' \
-e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
-e 's,@extra@,${systemExtraxml},' \
> "$out/system-local.conf"
sed '${./dbus-session-local.conf.in}' \
-e 's,@extra@,${sessionExtraxml},' \
> "$out/session-local.conf"
'';
configDir = pkgs.makeDBusConf {
suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper";
serviceDirectories = cfg.packages;
};
in

10
pkgs/development/libraries/dbus/default.nix
View File

@ -50,7 +50,8 @@ self = stdenv.mkDerivation {
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
"--with-systemduserunitdir=$(out)/etc/systemd/user"
"--enable-user-session"
"--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
"--datadir=/etc"
"--libexecdir=$(out)/libexec"
] ++ lib.optional (!x11Support) "--without-x";
# Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
@ -63,7 +64,12 @@ self = stdenv.mkDerivation {
doCheck = true;
installFlags = [ "sysconfdir=$(out)/etc" ];
installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
postInstall = ''
mkdir -p $doc/share/xml/dbus
cp doc/*.dtd $doc/share/xml/dbus
'';
# it's executed from $lib by absolute path
postFixup = ''

27
pkgs/development/libraries/dbus/make-dbus-conf.nix Normal file
View File

@ -0,0 +1,27 @@
{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }:
/* DBus has two configuration parsers -- normal and "trivial", which is used
* for suid helper. Unfortunately the latter doesn't support <include>
* directive. That means that we can't just place our configuration to
* *-local.conf -- it needs to be in the main configuration file.
*/
runCommand "dbus-1"
{
buildInputs = [ libxslt ];
inherit serviceDirectories suidHelper;
}
''
mkdir -p $out
xsltproc \
--stringparam serviceDirectories "$serviceDirectories" \
--stringparam suidHelper "$suidHelper" \
--path ${dbus.doc}/share/xml/dbus \
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
> $out/system.conf
xsltproc \
--stringparam serviceDirectories "$serviceDirectories" \
--path ${dbus.doc}/share/xml/dbus \
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
> $out/session.conf
''

30
pkgs/development/libraries/dbus/make-session-conf.xsl Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0"?>
<!--
This script copies the original system.conf from the dbus
distribution, but sets paths from $serviceDirectories parameter
and suid helper from $suidHelper parameter.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
extension-element-prefixes="str"
>
<xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
<xsl:param name="serviceDirectories" />
<xsl:template match="/busconfig">
<busconfig>
<xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_session_servicedirs' and name() != 'servicedir' and name() != 'includedir']" />
<xsl:for-each select="str:tokenize($serviceDirectories)">
<servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir>
<includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir>
</xsl:for-each>
</busconfig>
</xsl:template>
</xsl:stylesheet>

34
pkgs/development/libraries/dbus/make-system-conf.xsl Normal file
View File

@ -0,0 +1,34 @@
<?xml version="1.0"?>
<!--
This script copies the original system.conf from the dbus
distribution, but sets paths from $serviceDirectories parameter
and suid helper from $suidHelper parameter.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:str="http://exslt.org/strings"
extension-element-prefixes="str"
>
<xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
<xsl:param name="serviceDirectories" />
<xsl:param name="suidHelper" />
<xsl:template match="/busconfig">
<busconfig>
<xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_system_servicedirs' and name() != 'servicehelper' and name() != 'servicedir' and name() != 'includedir']" />
<!-- set suid helper -->
<servicehelper><xsl:value-of select="$suidHelper" /></servicehelper>
<xsl:for-each select="str:tokenize($serviceDirectories)">
<servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
<includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
</xsl:for-each>
</busconfig>
</xsl:template>
</xsl:stylesheet>

5
pkgs/top-level/all-packages.nix
View File

@ -7089,6 +7089,11 @@ with pkgs;
dbus_libs = dbus;
dbus_daemon = dbus.daemon;
makeDBusConf = { suidHelper, serviceDirectories }:
callPackage ../development/libraries/dbus/make-dbus-conf.nix {
inherit suidHelper serviceDirectories;
};
dee = callPackage ../development/libraries/dee { };
dhex = callPackage ../applications/editors/dhex { };