From fc6684054d054ad677a49e2a3ba162563e126093 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 03:09:41 +0100 Subject: [PATCH] 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 Cc: @abbradar --- pkgs/development/libraries/dbus/make-dbus-conf.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 46cf1046d6a..a45b4b5443c 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -10,7 +10,6 @@ */ runCommand "dbus-1" { - buildInputs = [ libxslt ]; inherit serviceDirectories suidHelper; XML_CATALOG_FILES = writeText "dbus-catalog.xml" '' @@ -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