mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-24 13:05:08 +00:00
pkgs/applications/version-management/git-and-tools/default.nix: use docbook dtd 4.5
Ensure that the 4.5 DTD required by asciidoc is available. svn path=/nixpkgs/trunk/; revision=18078
This commit is contained in:
parent
c0773ee99d
commit
b06c0d1a1d
@ -11,7 +11,7 @@ rec {
|
|||||||
git = import ./git {
|
git = import ./git {
|
||||||
inherit fetchurl stdenv curl openssl zlib expat perl gettext
|
inherit fetchurl stdenv curl openssl zlib expat perl gettext
|
||||||
asciidoc texinfo xmlto docbook2x
|
asciidoc texinfo xmlto docbook2x
|
||||||
docbook_xsl docbook_xml_dtd_42 libxslt
|
docbook_xsl docbook_xml_dtd_45 libxslt
|
||||||
cpio tcl tk makeWrapper subversion;
|
cpio tcl tk makeWrapper subversion;
|
||||||
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
|
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
|
||||||
guiSupport = getConfig ["git" "guiSupport"] false;
|
guiSupport = getConfig ["git" "guiSupport"] false;
|
||||||
@ -21,7 +21,7 @@ rec {
|
|||||||
gitGit = import ./git/git-git.nix {
|
gitGit = import ./git/git-git.nix {
|
||||||
inherit fetchurl stdenv curl openssl zlib expat perl gettext
|
inherit fetchurl stdenv curl openssl zlib expat perl gettext
|
||||||
asciidoc texinfo xmlto docbook2x
|
asciidoc texinfo xmlto docbook2x
|
||||||
docbook_xsl docbook_xml_dtd_42 libxslt
|
docbook_xsl docbook_xml_dtd_45 libxslt
|
||||||
cpio tcl tk makeWrapper subversion autoconf;
|
cpio tcl tk makeWrapper subversion autoconf;
|
||||||
inherit (bleedingEdgeRepos) sourceByName;
|
inherit (bleedingEdgeRepos) sourceByName;
|
||||||
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
|
svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
|
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
|
||||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
|
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||||
, libxslt, tcl, tk, makeWrapper
|
, libxslt, tcl, tk, makeWrapper
|
||||||
, svnSupport, subversion, perlLibs
|
, svnSupport, subversion, perlLibs
|
||||||
, guiSupport
|
, guiSupport
|
||||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
|
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
|
||||||
++ # documentation tools
|
++ # documentation tools
|
||||||
[ asciidoc texinfo xmlto docbook2x
|
[ asciidoc texinfo xmlto docbook2x
|
||||||
docbook_xsl docbook_xml_dtd_42 libxslt ]
|
docbook_xsl docbook_xml_dtd_45 libxslt ]
|
||||||
++ stdenv.lib.optionals guiSupport [tcl tk];
|
++ stdenv.lib.optionals guiSupport [tcl tk];
|
||||||
|
|
||||||
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
|
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
|
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
|
||||||
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
|
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
|
||||||
, libxslt, tcl, tk, makeWrapper
|
, libxslt, tcl, tk, makeWrapper
|
||||||
, svnSupport, subversion, perlLibs
|
, svnSupport, subversion, perlLibs
|
||||||
, guiSupport
|
, guiSupport
|
||||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf]
|
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf]
|
||||||
++ # documentation tools
|
++ # documentation tools
|
||||||
[ asciidoc texinfo xmlto docbook2x
|
[ asciidoc texinfo xmlto docbook2x
|
||||||
docbook_xsl docbook_xml_dtd_42 libxslt ]
|
docbook_xsl docbook_xml_dtd_45 libxslt ]
|
||||||
++ stdenv.lib.optionals guiSupport [tcl tk];
|
++ stdenv.lib.optionals guiSupport [tcl tk];
|
||||||
|
|
||||||
preConfigure = "autoconf";
|
preConfigure = "autoconf";
|
||||||
|
Loading…
Reference in New Issue
Block a user