3
0
Fork 0
forked from mirrors/nixpkgs

Use override for gitFull

svn path=/nixpkgs/trunk/; revision=20927
This commit is contained in:
Yury G. Kudryashov 2010-04-02 12:39:38 +00:00
parent 284c448d12
commit b01b22892b

View file

@ -8,7 +8,7 @@ let
in in
rec { rec {
git = import ./git { git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext inherit fetchurl stdenv curl openssl zlib expat perl python gettext
asciidoc texinfo xmlto docbook2x asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt docbook_xsl docbook_xml_dtd_45 libxslt
@ -19,14 +19,9 @@ rec {
}; };
# The full-featured Git. # The full-featured Git.
gitFull = import ./git rec { gitFull = git.override {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext
asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt
cpio tcl tk makeWrapper subversion;
svnSupport = true; svnSupport = true;
guiSupport = true; guiSupport = true;
perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
}; };
gitGit = import ./git/git-git.nix { gitGit = import ./git/git-git.nix {