make-dbus-conf: Use libxslt.bin instead of .dev
The problem with using libxslt as buildInputs is that the dev output is used for building the dbus config. This is one of the reasons why the installer tests are failing since ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd, because the tests do not have libxslt.dev in their closure and really shouldn't. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @abbradar
This commit is contained in:
parent
edce2b759c
commit
fc6684054d
@ -10,7 +10,6 @@
|
||||
*/
|
||||
runCommand "dbus-1"
|
||||
{
|
||||
buildInputs = [ libxslt ];
|
||||
inherit serviceDirectories suidHelper;
|
||||
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
|
||||
<?xml version="1.0"?>
|
||||
@ -28,12 +27,12 @@ runCommand "dbus-1"
|
||||
''
|
||||
mkdir -p $out
|
||||
|
||||
xsltproc --nonet \
|
||||
${libxslt.bin}/bin/xsltproc --nonet \
|
||||
--stringparam serviceDirectories "$serviceDirectories" \
|
||||
--stringparam suidHelper "$suidHelper" \
|
||||
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
|
||||
> $out/system.conf
|
||||
xsltproc --nonet \
|
||||
${libxslt.bin}/bin/xsltproc --nonet \
|
||||
--stringparam serviceDirectories "$serviceDirectories" \
|
||||
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
|
||||
> $out/session.conf
|
||||
|
Loading…
Reference in New Issue
Block a user