cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix

42 lines
1.5 KiB
Nix
Raw Normal View History

make-dbus-conf: Don't try to access network This is the output of the builder: building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1' error : connection refused error : connection refused However, even when using --nonet we'd still get this: I/O error : Attempt to load network entity http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd So in order to avoid this, we now provide an XML catalog file, mapping the public URLs to the local DTD paths inside the store instead of using --path (which doesn't seem to work with xsltproc). Tested this by comparing the SHA256 (nix-hash --type sha256) of the output path generated by: nix-build -E '(import ./. {}).makeDBusConf { suidHelper = "SUIDHELPER"; serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ]; }' ... with the SHA256 of the generated output path prior to this commit and they have the same hash: 6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @abbradar
2017-02-20 00:54:19 +01:00
{ runCommand, writeText, libxslt, dbus
, serviceDirectories ? []
, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
}:
makeDBusConf: init Use XSLT transform to modify stock dbus configuration file. This is needed because some dbus components doesn't support <include> so we need to put our core configuration in the main file.
2017-02-16 12:55:38 +01:00
/* 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"
{
inherit serviceDirectories suidHelper;
make-dbus-conf: prefer local build
2017-11-12 04:52:21 +01:00
preferLocalBuild = true;
make-dbus-conf: Don't try to access network This is the output of the builder: building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1' error : connection refused error : connection refused However, even when using --nonet we'd still get this: I/O error : Attempt to load network entity http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd So in order to avoid this, we now provide an XML catalog file, mapping the public URLs to the local DTD paths inside the store instead of using --path (which doesn't seem to work with xsltproc). Tested this by comparing the SHA256 (nix-hash --type sha256) of the output path generated by: nix-build -E '(import ./. {}).makeDBusConf { suidHelper = "SUIDHELPER"; serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ]; }' ... with the SHA256 of the generated output path prior to this commit and they have the same hash: 6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @abbradar
2017-02-20 00:54:19 +01:00
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/"
dbus: Put DTDs into $out instead of $doc First of all, these "documents" are not really documentation, so it really doesn't make much sense to put it into $doc. The main point however is that the installer tests are failing since this was introduced in ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd. One way to circumvent this is putting dbus.doc into system.extraDependencies of the installer tests, but given the first point this sounds a bit odd to me. So I went for the second way of putting it into $out, because it's now basically necessary to build a NixOS system. With this the NixOS installer tests should now work again, although I have only tested this with the installer.simple test. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @abbradar
2017-02-20 03:16:26 +01:00
rewritePrefix="file://${dbus}/share/xml/dbus/"/>
make-dbus-conf: Don't try to access network This is the output of the builder: building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1' error : connection refused error : connection refused However, even when using --nonet we'd still get this: I/O error : Attempt to load network entity http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd So in order to avoid this, we now provide an XML catalog file, mapping the public URLs to the local DTD paths inside the store instead of using --path (which doesn't seem to work with xsltproc). Tested this by comparing the SHA256 (nix-hash --type sha256) of the output path generated by: nix-build -E '(import ./. {}).makeDBusConf { suidHelper = "SUIDHELPER"; serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ]; }' ... with the SHA256 of the generated output path prior to this commit and they have the same hash: 6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @abbradar
2017-02-20 00:54:19 +01:00
</catalog>
'';
make-dbus-conf: Don't depend on unnecessary libxslt outputs Might fix https://hydra.nixos.org/build/71580290.
2018-03-21 21:12:41 +01:00
nativeBuildInputs = [ libxslt.bin ];
makeDBusConf: init Use XSLT transform to modify stock dbus configuration file. This is needed because some dbus components doesn't support <include> so we need to put our core configuration in the main file.
2017-02-16 12:55:38 +01:00
}
''
mkdir -p $out
make-dbus-conf: Fix cross-compilation.
2018-02-28 20:40:49 +01:00
xsltproc --nonet \
makeDBusConf: init Use XSLT transform to modify stock dbus configuration file. This is needed because some dbus components doesn't support <include> so we need to put our core configuration in the main file.
2017-02-16 12:55:38 +01:00
--stringparam serviceDirectories "$serviceDirectories" \
--stringparam suidHelper "$suidHelper" \
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
> $out/system.conf
make-dbus-conf: Fix cross-compilation.
2018-02-28 20:40:49 +01:00
xsltproc --nonet \
makeDBusConf: init Use XSLT transform to modify stock dbus configuration file. This is needed because some dbus components doesn't support <include> so we need to put our core configuration in the main file.
2017-02-16 12:55:38 +01:00
--stringparam serviceDirectories "$serviceDirectories" \
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
> $out/session.conf
''
Reference in a new issue Copy permalink