colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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
This commit is contained in:
Eelco Dolstra 2008-06-11 12:31:44 +00:00
parent d139e5244c
commit 68c6b5f2fc
2 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
pkgs/applications/version-management/git/default.nix
View File

@ -1,7 +1,9 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs, cpio
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, cpio
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
, libxslt, tcl, tk, makeWrapper
, svnSupport, subversion, perlLibs }:
, svnSupport, subversion, perlLibs
, guiSupport
}:
# `git-svn' support requires Subversion and various Perl libraries.
# FIXME: We should make sure Subversion comes with its Perl bindings.
@ -18,28 +20,22 @@ stdenv.mkDerivation rec {
patches = [ ./pwd.patch ./docbook2texi.patch ];
buildInputs = [curl openssl zlib expat gettext cpio]
++ (if emacs != null then [emacs] else [])
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools
[ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_42 libxslt ]
++ # Tcl/Tk
[ tcl tk makeWrapper ];
++ stdenv.lib.optionals guiSupport [tcl tk];
makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
postInstall =
(if emacs != null then
''# Install Emacs mode.
echo "installing Emacs mode..."
make install -C contrib/emacs prefix="$out"
# XXX: There are other things under `contrib' that people might want to
# install. ''
else
''echo "NOT installing Emacs mode. Set \`git.useEmacs' to \`true' in your"
echo "\`~/.nixpkgs/config.nix' file to change it." '')
''
# Install Emacs mode.
echo "installing Emacs mode..."
ensureDir $out/share/emacs/site-lisp
cp -p contrib/emacs/*.el $out/share/emacs/site-lisp
'' # */
+ (if svnSupport then
''# wrap git-svn
@ -47,9 +43,9 @@ stdenv.mkDerivation rec {
for i in ${builtins.toString perlLibs}; do
gitperllib=$gitperllib:$i/lib/site_perl
done
wrapProgram "$out/bin/git-svn" \
--set GITPERLLIB "$gitperllib" \
--prefix PATH : "${subversion}/bin" ''
wrapProgram "$out/bin/git-svn" \
--set GITPERLLIB "$gitperllib" \
--prefix PATH : "${subversion}/bin" ''
else ''
echo "NOT installing \`git-svn' since \`svnSupport' is false."
rm $out/bin/git-svn '')
@ -58,16 +54,18 @@ stdenv.mkDerivation rec {
make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
-C Documentation ''
+ ''# Wrap Tcl/Tk programs
+ (if guiSupport then ''
# Wrap Tcl/Tk programs
for prog in gitk git-gui git-citool
do
wrapProgram "$out/bin/$prog" \
--set TK_LIBRARY "${tk}/lib/tk8.4" \
--prefix PATH : "${tk}/bin"
done ''
wrapProgram "$out/bin/$prog" \
--set TK_LIBRARY "${tk}/lib/tk8.4" \
--prefix PATH : "${tk}/bin"
done
'' else "")
+ ''# Wrap `git-clone'
wrapProgram $out/bin/git-clone \
wrapProgram $out/bin/git-clone \
--prefix PATH : "${cpio}/bin" '';
meta = {

12
pkgs/top-level/all-packages.nix
View File

@ -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 {