diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-24 11:27:36 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-24 15:07:44 -0400 |
| commit | 9ff1601dc734a9a01aec79802d548cb4195d2304 (patch) | |
| tree | ec879e9999c24e4bb96fc420fed71cdcf4c403a2 /pkgs/development/libraries/dbus | |
| parent | d35a71a2da1a22b403eb1dc77424563e330326bb (diff) | |
| download | nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar.gz nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar.bz2 nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar.lz nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar.xz nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.tar.zst nixlib-9ff1601dc734a9a01aec79802d548cb4195d2304.zip | |
make-dbus-conf: use share/xml/dbus-1
Diffstat (limited to 'pkgs/development/libraries/dbus')
| -rw-r--r-- | pkgs/development/libraries/dbus/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index c962f50d3b89..616ad869d57c 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/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" diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix index 5d441c5d1331..e714b96b7e9f 100644 --- a/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/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 ]; |