From 3e7649f01be8b7a4295bd414e6cb905affff7d66 Mon Sep 17 00:00:00 2001
From: pennae <github@quasiparticle.net>
Date: Sun, 11 Jun 2023 18:47:43 +0200
Subject: [PATCH] docbook-xsl: remove nixos-specific patch

we're no longer using docbook to render the manpages, so we don't need
this patch for our manuals to be usable. remove it to reduce the diff
between nixos and other distros for this package.
---
 .../sgml+xml/stylesheets/xslt/docbook-xsl/default.nix |  6 +-----
 .../docbook-xsl/fix-man-options-duplication.patch     | 11 -----------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch

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 2f9d22e57d89..735dfdb4f81b 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, withManOptDedupPatch ? false }:
+{ lib, stdenv, substituteAll, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
 
 let
 
@@ -36,10 +36,6 @@ 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
deleted file mode 100644
index 304d9781e6aa..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/fix-man-options-duplication.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/manpages/lists.xsl
-+++ b/manpages/lists.xsl
-@@ -110,7 +110,7 @@
-   <xsl:text>.RE&#10;</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]|