fixed/removed extra git-svn wrapper. Now you can enable svn support by git = { svnSupport = true; }, git-svn executable is removed if you don't enable it

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

2 files changed, 13 insertions, 34 deletions

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 6ec279e84b480..764fd6a0203c6 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs, cpio
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
-, libxslt, tcl, tk, makeWrapper }:
+, libxslt, tcl, tk, makeWrapper, svnSupport, subversion, perlLibs }:
 
 stdenv.mkDerivation rec {
   name = "git-1.5.5";
@@ -33,6 +33,18 @@ 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
+        gitperllib=$out/lib/site_perl
+        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" ''
+       else ''# rm git-svn
+       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 ''
diff --git a/pkgs/applications/version-management/git/git-svn-wrapper.nix b/pkgs/applications/version-management/git/git-svn-wrapper.nix
deleted file mode 100644
index e20417db4d54f..0000000000000
--- a/pkgs/applications/version-management/git/git-svn-wrapper.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, subversion, git, perlLibs }:
-
-if (!subversion.perlBindings)
-  then throw "svn perl bindings required to install gitsvnwrapper"
-else stdenv.mkDerivation {
-  inherit perlLibs;
-  name = "git-svn-wrapper";
-  phases = "buildPhase";
-  buildPhase = "
-    gitperllib=${git}/lib/site_perl
-    for i in \$perlLibs; do
-      gitperllib=\$gitperllib:\$i/lib/site_perl
-    done
-
-    ensureDir \$out/bin
-    for a in ${git}/bin/git-svn; do
-      target=\$out/bin/\$(basename $a)
-      target=\$out/bin/\$(basename $a)
-      echo \"#!/bin/sh
-        export GITPERLLIB=\$gitperllib
-        PATH=\\\$PATH:${subversion}/bin
-        $a \\\"\\\$@\\\"
-      \" > \$target
-      chmod +x \$target
-    done
-  ";
-
-  meta = { 
-    description = "git-svn, a bidirectional Git/Subversion gateway";
-    license = "GPLv2";
-    homepage = http://git.or.cz/;
-  };
-}