diff options
| author | Peter Simons <simons@cryp.to> | 2009-11-03 15:57:31 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2009-11-03 15:57:31 +0000 |
| commit | b06c0d1a1dd65115d82b29fe9fa8a9dac4143d47 (patch) | |
| tree | 593d2ac30837635ce808539e31886c0b999440b9 /pkgs/applications/version-management | |
| parent | c0773ee99d7740ebd2c7b8f6f4059e1f68814eed (diff) | |
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
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 9e6c1043f0a7..a1e8cb903f60 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -11,7 +11,7 @@ rec { git = import ./git { inherit fetchurl stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt + docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support guiSupport = getConfig ["git" "guiSupport"] false; @@ -21,7 +21,7 @@ rec { gitGit = import ./git/git-git.nix { inherit fetchurl stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt + docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl tk makeWrapper subversion autoconf; inherit (bleedingEdgeRepos) sourceByName; svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 5992355110c5..06cc4b94d946 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,5 +1,5 @@ { 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 , svnSupport, subversion, perlLibs , guiSupport @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ # documentation tools [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}"; diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix index 03567b8a37d8..3a0e3aa9fa84 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix +++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix @@ -1,5 +1,5 @@ { 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 , svnSupport, subversion, perlLibs , guiSupport @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [curl openssl zlib expat gettext cpio makeWrapper autoconf] ++ # documentation tools [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_42 libxslt ] + docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; preConfigure = "autoconf"; |