diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-11 12:31:44 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-11 12:31:44 +0000 |
| commit | 68c6b5f2fc18d3468afc12ecd88c6b800b60fefc (patch) | |
| tree | 168de96e47f32e9b55e359973b8ae0367c0b09b4 /pkgs/top-level | |
| parent | d139e5244c25d6330038cdcab3b103c2b0404c62 (diff) | |
| download | nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar.gz nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar.bz2 nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar.lz nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar.xz nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.tar.zst nixlib-68c6b5f2fc18d3468afc12ecd88c6b800b60fefc.zip | |
* git: make the TCL/TK GUI optional (git.guiSupport).
* git: always install the Emacs mode but don't depend on Emacs to do it (just don't build the .elc files). svn path=/nixpkgs/trunk/; revision=12037
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f60834446c8..618e0faa2de8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5851,14 +5851,10 @@ let pkgs = rec { inherit fetchurl stdenv curl openssl zlib expat perl gettext asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_42 libxslt - cpio tcl tk makeWrapper; - - # for git-svn support: - svnSupport = getConfig [ "git" "svnSupport" ] false; - inherit subversion ; - perlLibs = [ perlLWP perlURI perlTermReadKey subversion ]; - - emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null; + cpio tcl tk makeWrapper subversion; + svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support + guiSupport = getConfig ["git" "guiSupport"] false; + perlLibs = [perlLWP perlURI perlTermReadKey subversion]; }; gkrellm = import ../applications/misc/gkrellm { |