public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
worldofpeace 2019-08-24 11:27:36 -04:00
parent d35a71a2da
commit 9ff1601dc7
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/dbus/default.nix
View File

@ -85,11 +85,6 @@ stdenv.mkDerivation rec {
"datadir=${placeholder ''out''}/share" "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 # it's executed from $lib by absolute path
postFixup = '' postFixup = ''
moveToOutput bin/dbus-launch "$lib" moveToOutput bin/dbus-launch "$lib"

2
pkgs/development/libraries/dbus/make-dbus-conf.nix
View File

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