diff options
| author | pennae <github@quasiparticle.net> | 2023-06-19 20:13:38 +0200 |
|---|---|---|
| committer | Yt <happysalada@tuta.io> | 2023-06-19 14:28:12 -0400 |
| commit | 6957b8ed8b6019b82883c6a857a9d089e257650e (patch) | |
| tree | 0a31a32023ee888bd33b6cff8054ba0ed955b8d4 /pkgs/data | |
| parent | e9e5a4a5f858fe73da37b1963d18f99e465b1716 (diff) | |
| download | nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar.gz nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar.bz2 nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar.lz nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar.xz nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.tar.zst nixlib-6957b8ed8b6019b82883c6a857a9d089e257650e.zip | |
docbook-xsl: restore nixos-specific patch
This reverts commit 3e7649f01be8b7a4295bd414e6cb905affff7d66. turns out that home-manager depends on it, and restoring this patch for now seems preferrable to breaking home-manager until they move away from docbook for their manpage generation.
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 735dfdb4f81b..2f9d22e57d89 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }: +{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash, withManOptDedupPatch ? false }: let @@ -36,6 +36,10 @@ let src = ./catalog-legacy-uris.patch; inherit legacySuffix suffix version; }) + ] ++ lib.optionals withManOptDedupPatch [ + # Fixes https://github.com/NixOS/nixpkgs/issues/166304 + # https://github.com/docbook/xslt10-stylesheets/pull/241 + ./fix-man-options-duplication.patch ]; propagatedBuildInputs = [ findXMLCatalogs ]; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch new file mode 100644 index 000000000000..304d9781e6aa --- /dev/null +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch @@ -0,0 +1,11 @@ +--- a/manpages/lists.xsl ++++ b/manpages/lists.xsl +@@ -110,7 +110,7 @@ + <xsl:text>.RE </xsl:text> + </xsl:template> + +-<xsl:template match="d:varlistentry/d:term"/> ++<xsl:template match="d:varlistentry/d:term" priority="1"/> + <xsl:template match="d:glossentry/d:glossterm"/> + + <xsl:template match="d:variablelist[ancestor::d:listitem or ancestor::d:step or ancestor::d:glossdef]| |