makeDBusConf: use upstream XML catalog
dbus package now ships a catalog file so we no longer need to create a custom one.
This commit is contained in:
parent
caf6e09b70
commit
d172061281
|
@ -1,4 +1,8 @@
|
|||
{ runCommand, writeText, libxslt, dbus
|
||||
{ runCommand
|
||||
, writeText
|
||||
, libxslt
|
||||
, dbus
|
||||
, findXMLCatalogs
|
||||
, serviceDirectories ? []
|
||||
, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
|
||||
, apparmor ? "disabled" # one of enabled, disabled, required
|
||||
|
@ -14,19 +18,15 @@ runCommand "dbus-1"
|
|||
inherit serviceDirectories suidHelper apparmor;
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
|
||||
<?xml version="1.0"?>
|
||||
<!DOCTYPE catalog PUBLIC
|
||||
"-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
|
||||
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
|
||||
|
||||
<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-1/"/>
|
||||
</catalog>
|
||||
'';
|
||||
nativeBuildInputs = [ libxslt.bin ];
|
||||
nativeBuildInputs = [
|
||||
libxslt
|
||||
findXMLCatalogs
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
dbus
|
||||
];
|
||||
}
|
||||
''
|
||||
mkdir -p $out
|
||||
|
|
Loading…
Reference in a new issue