diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 376fe9f64eec..b3723f1b4d21 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -30,7 +30,13 @@ stdenv.mkDerivation rec { sha256 = "1zp5gpx61v1cpqf2zwb1cidhp9xylvw49d3zydkxqk6b1qa20xpp"; }; - patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = [ + # 'generate.consistent.ids=1' ensures reproducible docs, for further details see + # http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html + # Also applied upstream in https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189, + # expected in version 1.14 + ./docs-reproducible-ids.patch + ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); postPatch = '' substituteInPlace tools/Makefile.in \ diff --git a/pkgs/development/libraries/dbus/docs-reproducible-ids.patch b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch new file mode 100644 index 000000000000..2356b64d95cf --- /dev/null +++ b/pkgs/development/libraries/dbus/docs-reproducible-ids.patch @@ -0,0 +1,15 @@ +diff --color -Naur dbus-1.12.20-original/doc/Makefile.in dbus-1.12.20-hacked2/doc/Makefile.in +--- dbus-1.12.20-original/doc/Makefile.in 2020-07-02 12:10:41.000000000 +0200 ++++ dbus-1.12.20-hacked2/doc/Makefile.in 2020-11-07 09:57:15.297694773 +0100 +@@ -870,8 +870,10 @@ + .PRECIOUS: Makefile + + ++# 'generate.consistent.ids=1' ensures reproducible docs, for further details see ++# http://docbook.sourceforge.net/release/xsl/current/doc/html/generate.consistent.ids.html + @DBUS_XML_DOCS_ENABLED_TRUE@%.html: %.xml +-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $< ++@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $< + + @DBUS_XML_DOCS_ENABLED_TRUE@%.1: %.1.xml + @DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) man $<