From c5b2714bc79a27230690821c1c6bd99bdd457c63 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 20 Feb 2017 03:16:26 +0100 Subject: [PATCH] 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 Cc: @abbradar --- pkgs/development/libraries/dbus/default.nix | 4 ++-- pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 49b71ff99748..7075874adf87 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -67,8 +67,8 @@ self = stdenv.mkDerivation { installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ]; postInstall = '' - mkdir -p $doc/share/xml/dbus - cp doc/*.dtd $doc/share/xml/dbus + mkdir -p "$out/share/xml/dbus" + cp doc/*.dtd "$out/share/xml/dbus" ''; # it's executed from $lib by absolute path diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index a45b4b5443c5..d836d87efef8 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -20,7 +20,7 @@ runCommand "dbus-1" + rewritePrefix="file://${dbus}/share/xml/dbus/"/> ''; }