summary refs log tree commit diff
path: root/pkgs/data/sgml+xml
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-01-29 21:25:07 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-01-29 21:25:07 +0100
commit15c471e444bdba3ec5dc947f927aeadaba7ebc99 (patch)
treec1d4ce46d3c8c76b363c6f353686c903744d7e76 /pkgs/data/sgml+xml
parent303d5b119e3f3342cb6f8c3fc2314c462f2ed5fc (diff)
downloadnixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar.gz
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar.bz2
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar.lz
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar.xz
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.tar.zst
nixpkgs-15c471e444bdba3ec5dc947f927aeadaba7ebc99.zip
docbook-xsl: apply Debian/Fedora patch to fix issues
Our samba now got hit by that bug: https://hydra.nixos.org/build/68373563
Diffstat (limited to 'pkgs/data/sgml+xml')
-rw-r--r--pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix10
1 files changed, 9 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 dac9d27f66c..c78dcc0596e 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, fetchurl, findXMLCatalogs, writeScriptBin, ruby, bash }:
+{ lib, stdenv, fetchurl, fetchpatch, findXMLCatalogs, writeScriptBin, ruby, bash }:
 
 let
 
@@ -10,6 +10,14 @@ let
       inherit sha256;
     };
 
+    patches = [(fetchpatch {
+      name = "potential-infinite-template-recursion.patch";
+      url = "https://src.fedoraproject.org/cgit/rpms/docbook-style-xsl.git/"
+          + "plain/docbook-style-xsl-non-recursive-string-subst.patch?id=bf9e5d16fd";
+      sha256 = "1pfb468bsj3j879ip0950waih0r1s6rzfbm2p70glbz0g3903p7h";
+      stripLen = "1";
+    })];
+
     propagatedBuildInputs = [ findXMLCatalogs ];
 
     dontBuild = true;