From b01b22892b6a00a33af967789fe6e2679413beb0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 2 Apr 2010 12:39:38 +0000
Subject: [PATCH] Use override for gitFull
svn path=/nixpkgs/trunk/; revision=20927
---
.../version-management/git-and-tools/default.nix | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 282dec88c4c2..fc998a8b23ba 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -8,7 +8,7 @@ let
in
rec {
- git = import ./git {
+ git = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext
asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt
@@ -19,14 +19,9 @@ rec {
};
# The full-featured Git.
- gitFull = import ./git rec {
- 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;
+ gitFull = git.override {
svnSupport = true;
guiSupport = true;
- perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
};
gitGit = import ./git/git-git.nix {