diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2022-03-31 02:34:42 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2022-04-03 21:22:47 +0200 |
commit | 84d6565d52d1f9f25280f8dc1716b90238fbb738 (patch) | |
tree | 468b18816b47ddd8aa83c7ccf7104701706cdd49 /nixos/doc/manual/default.nix | |
parent | 05a6c124e65d30b5e68468c8b87f73d6b1a8c587 (diff) |
nixos/man: prevent duplication of options
libxslt 1.1.35 fixed conflict resolution for templates to match the specification. This uncovered a bug in docbook-xsl (https://github.com/docbook/xslt10-stylesheets/issues/240), which causes option names to be duplicated into the option descriptions. Let’s resolve the conflict by patching the stylesheets. Fixes: https://github.com/NixOS/nixpkgs/issues/166304
Diffstat (limited to 'nixos/doc/manual/default.nix')
-rw-r--r-- | nixos/doc/manual/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index e96bc47b4a53b..bcb5d0d02f74f 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -14,6 +14,10 @@ with pkgs; let lib = pkgs.lib; + docbook_xsl_ns = pkgs.docbook-xsl-ns.override { + withManOptDedupPatch = true; + }; + # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, # or else the build will fail. |