about summary refs log tree commit diff
path: root/pkgs/top-level/all-packages.nix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2008-02-22 16:51:51 +0000
committerLudovic Courtès <ludo@gnu.org>2008-02-22 16:51:51 +0000
commitadc77fc0c797067fb2a5e7546b6944100437f4f4 (patch)
tree3644fc7b8163712fbbdd739b990e8a2d2d81c4e8 /pkgs/top-level/all-packages.nix
parentc800565c73b886cb0d2ff2c6b790e896eab6dd54 (diff)
Git: Make dependency on Emacs optional, per Yuri's request.
This works by looking for `git.useEmacs', a boolean, in the user's Nixpkgs
config file.  The default is `true' since it's only a build-time dependency
and most users are expected to install the pre-compiled substitute, which
doesn't pull Emacs.

svn path=/nixpkgs/trunk/; revision=10837
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 568d738f16bc2..9b6ed7c3ec535 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4844,7 +4844,8 @@ rec {
   };
 
   git = import ../applications/version-management/git {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext emacs;
+    inherit fetchurl stdenv curl openssl zlib expat perl gettext;
+    emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
   };
 
   gkrellm = import ../applications/misc/gkrellm {