From 15c471e444bdba3ec5dc947f927aeadaba7ebc99 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 29 Jan 2018 21:25:07 +0100 Subject: docbook-xsl: apply Debian/Fedora patch to fix issues Our samba now got hit by that bug: https://hydra.nixos.org/build/68373563 --- pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgs/data') 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; -- cgit 1.4.1