make-dbus-conf: use share/xml/dbus-1

pkgs/development/libraries/dbus/default.nix

@@ -85,11 +85,6 @@ stdenv.mkDerivation rec {
     "datadir=${placeholder ''out''}/share"
   ];
 
-  postInstall = ''
-    mkdir -p "$out/share/xml/dbus"
-    cp doc/*.dtd "$out/share/xml/dbus"
-  '';
-
   # it's executed from $lib by absolute path
   postFixup = ''
     moveToOutput bin/dbus-launch "$lib"

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

@@ -22,7 +22,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}/share/xml/dbus/"/>
+          rewritePrefix="file://${dbus}/share/xml/dbus-1/"/>
       </catalog>
     '';
     nativeBuildInputs = [ libxslt.bin ];