diff options
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/make-dbus-conf.nix | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 7e35a9162c8..46cf1046d6a 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -1,4 +1,7 @@ -{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }: +{ runCommand, writeText, 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> @@ -9,19 +12,29 @@ runCommand "dbus-1" { buildInputs = [ libxslt ]; inherit serviceDirectories suidHelper; + XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' + <?xml version="1.0"?> + <!DOCTYPE catalog PUBLIC + "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" + "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> + + <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> + <rewriteSystem + systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/" + rewritePrefix="file://${dbus.doc}/share/xml/dbus/"/> + </catalog> + ''; } '' mkdir -p $out - xsltproc \ + xsltproc --nonet \ --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 \ + xsltproc --nonet \ --stringparam serviceDirectories "$serviceDirectories" \ - --path ${dbus.doc}/share/xml/dbus \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf '' |