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 ac0cdc1952.

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

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

pkgs/development/libraries/dbus/make-dbus-conf.nix

@@ -20,7 +20,7 @@ runCommand "dbus-1"
       <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
         <rewriteSystem
           systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/"
-          rewritePrefix="file://${dbus.doc}/share/xml/dbus/"/>
+          rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
   }