JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
dbf1665daa
nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix

46 lines
1.7 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-19 23:54:19 +00:00
{ runCommand, writeText, libxslt, dbus
, serviceDirectories ? []
, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
dbus: Enable AppArmor mediation support
2020-11-02 21:11:38 +00:00
, apparmor ? "disabled" # one of enabled, disabled, required
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-19 23:54:19 +00:00
}:
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 11:55:38 +00: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"
{
dbus: Enable AppArmor mediation support
2020-11-02 21:11:38 +00:00
inherit serviceDirectories suidHelper apparmor;
make-dbus-conf: prefer local build
2017-11-12 03:52:21 +00:00
preferLocalBuild = true;
makeDBusConfig: don't allow substitutions This is rebuilt virtually every time a NixOS module is enabled or disabled, so I don't think it makes sense to have it substituted. It gets in the way of trivial config changes when I would otherwise be able to rebuild my system entirely offline.
2019-03-17 01:08:44 +00:00
allowSubstitutes = false;
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-19 23:54:19 +00: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/"
make-dbus-conf: use share/xml/dbus-1
2019-08-24 16:27:36 +01:00
rewritePrefix="file://${dbus}/share/xml/dbus-1/"/>
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-19 23:54:19 +00:00
</catalog>
'';
make-dbus-conf: Don't depend on unnecessary libxslt outputs Might fix https://hydra.nixos.org/build/71580290.
2018-03-21 20:12:41 +00: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 11:55:38 +00:00
}
''
mkdir -p $out
make-dbus-conf: Fix cross-compilation.
2018-02-28 19:40:49 +00: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 11:55:38 +00:00
--stringparam serviceDirectories "$serviceDirectories" \
--stringparam suidHelper "$suidHelper" \
dbus: Enable AppArmor mediation support
2020-11-02 21:11:38 +00:00
--stringparam apparmor "$apparmor" \
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 11:55:38 +00:00
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
> $out/system.conf
make-dbus-conf: Fix cross-compilation.
2018-02-28 19:40:49 +00: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 11:55:38 +00:00
--stringparam serviceDirectories "$serviceDirectories" \
dbus: Enable AppArmor mediation support
2020-11-02 21:11:38 +00:00
--stringparam apparmor "$apparmor" \
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 11:55:38 +00:00
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
> $out/session.conf
''
Reference in New Issue Copy Permalink