summary refs log tree commit diff
path: root/pkgs/development/libraries/dbus/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2017-02-20 03:16:26 +0100
committeraszlig <aszlig@redmoonstudios.org>2017-02-20 03:24:38 +0100
commitc5b2714bc79a27230690821c1c6bd99bdd457c63 (patch)
treed9485aca1d5b2a3d6e1516a0c4889f3b32f7fadd /pkgs/development/libraries/dbus/default.nix
parentfc6684054d054ad677a49e2a3ba162563e126093 (diff)
downloadnixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar.gz
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar.bz2
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar.lz
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar.xz
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.tar.zst
nixpkgs-c5b2714bc79a27230690821c1c6bd99bdd457c63.zip
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 <aszlig@redmoonstudios.org>
Cc: @abbradar
Diffstat (limited to 'pkgs/development/libraries/dbus/default.nix')
-rw-r--r--pkgs/development/libraries/dbus/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 49b71ff9974..7075874adf8 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