diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:49:44 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-01-30 19:49:44 +0100 |
commit | e851d53ceaf2cd48d0757c385626dd2040db0f12 (patch) | |
tree | 555222e0dea08e8f9b77079a1226a561af49166a /pkgs/data/sgml+xml | |
parent | 15c471e444bdba3ec5dc947f927aeadaba7ebc99 (diff) |
docbook-xsl-ns: "revert" after parent commit
I didn't realize I was redefining two derivations at once.
Diffstat (limited to 'pkgs/data/sgml+xml')
-rw-r--r-- | pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix | 19 |
1 files changed, 11 insertions, 8 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 c78dcc0596e30..e965882a9c3cd 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -2,7 +2,7 @@ let - common = { pname, sha256 }: let self = stdenv.mkDerivation rec { + common = { pname, sha256, patches ? [] }: let self = stdenv.mkDerivation rec { name = "${pname}-1.79.1"; src = fetchurl { @@ -10,13 +10,7 @@ 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"; - })]; + inherit patches; propagatedBuildInputs = [ findXMLCatalogs ]; @@ -52,6 +46,15 @@ in { docbook_xsl = common { pname = "docbook-xsl"; sha256 = "0s59lihif2fr7rznckxr2kfyrvkirv76r1zvidp9b5mj28p4apvj"; + + 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"; + })]; + }; docbook_xsl_ns = common { |