Git: Don't depend on Perl libs and Subversion when no Subversion support is built.

svn path=/nixpkgs/trunk/; revision=11877

1 files changed, 13 insertions, 4 deletions

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 764fd6a0203c..323b5d27d0c4 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -1,6 +1,12 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs, cpio
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
-, libxslt, tcl, tk, makeWrapper, svnSupport, subversion, perlLibs }:
+, libxslt, tcl, tk, makeWrapper
+, svnSupport, subversion, perlLibs }:
+
+# `git-svn' support requires Subversion and various Perl libraries.
+# FIXME: We should make sure Subversion comes with its Perl bindings.
+assert svnSupport -> (subversion != null && perlLibs != []);
+
 
 stdenv.mkDerivation rec {
   name = "git-1.5.5";
@@ -33,6 +39,7 @@ stdenv.mkDerivation rec {
        else
          ''echo "NOT installing Emacs mode.  Set \`git.useEmacs' to \`true' in your"
 	   echo "\`~/.nixpkgs/config.nix' file to change it." '')
+
    + (if svnSupport then
 
       ''# wrap git-svn
@@ -41,10 +48,12 @@ stdenv.mkDerivation rec {
           gitperllib=$gitperllib:$i/lib/site_perl
         done
 	wrapProgram "$out/bin/git-svn"			\
-		     --set GITPERLLIB "$gitperllib"    \
+		     --set GITPERLLIB "$gitperllib"    	\
 		     --prefix PATH : "${subversion}/bin" ''
-       else ''# rm git-svn
-       rm $out/bin/git-svn '' )
+       else ''
+       echo "NOT installing \`git-svn' since \`svnSupport' is false."
+       rm $out/bin/git-svn '')
+
    + ''# Install man pages and Info manual
        make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''