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
ac0cdc1952, 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:
@@ -10,7 +10,6 @@
|
|||||||
*/
|
*/
|
||||||
runCommand "dbus-1"
|
runCommand "dbus-1"
|
||||||
{
|
{
|
||||||
buildInputs = [ libxslt ];
|
|
||||||
inherit serviceDirectories suidHelper;
|
inherit serviceDirectories suidHelper;
|
||||||
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
|
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
@@ -28,12 +27,12 @@ runCommand "dbus-1"
|
|||||||
''
|
''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
||||||
xsltproc --nonet \
|
${libxslt.bin}/bin/xsltproc --nonet \
|
||||||
--stringparam serviceDirectories "$serviceDirectories" \
|
--stringparam serviceDirectories "$serviceDirectories" \
|
||||||
--stringparam suidHelper "$suidHelper" \
|
--stringparam suidHelper "$suidHelper" \
|
||||||
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
|
${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
|
||||||
> $out/system.conf
|
> $out/system.conf
|
||||||
xsltproc --nonet \
|
${libxslt.bin}/bin/xsltproc --nonet \
|
||||||
--stringparam serviceDirectories "$serviceDirectories" \
|
--stringparam serviceDirectories "$serviceDirectories" \
|
||||||
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
|
${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
|
||||||
> $out/session.conf
|
> $out/session.conf
|
||||||
|
|||||||
Reference in New Issue
Block a user