From 2d5d5458182d26d67c8a5fe81f397813d576dedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 30 Mar 2008 22:19:20 +0000
Subject: [PATCH] Git: Fix more impurities.

svn path=/nixpkgs/trunk/; revision=11373
---
 .../version-management/git/default.nix        | 21 ++++++++++++------
 .../version-management/git/pwd.patch          | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/version-management/git/pwd.patch

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 5f04f532bb0..f0b851bc6c8 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs
+{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs, cpio
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
 , libxslt, tcl, tk, makeWrapper }:
 
@@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "16dcmkj7dfmr1cy28hi0ipc2qx7dy3knnb77w5bn78hwdfd2dcv9";
   };
 
-  patches = [ ./docbook2texi.patch ];
+  patches = [ ./pwd.patch ./docbook2texi.patch ];
 
-  buildInputs = [curl openssl zlib expat gettext]
+  buildInputs = [curl openssl zlib expat gettext cpio]
     ++ (if emacs != null then [emacs] else [])
     ++ # documentation tools
        [ asciidoc texinfo xmlto docbook2x
@@ -40,14 +40,21 @@ stdenv.mkDerivation rec {
    + ''# Wrap `gitk'
        wrapProgram $out/bin/gitk			\
                    --set TK_LIBRARY "${tk}/lib/tk8.4"	\
-                   --prefix PATH : "${tk}/bin" '';
+                   --prefix PATH : "${tk}/bin" ''
 
+   + ''# Wrap `git-clone'
+       wrapProgram $out/bin/git-clone			\
+                   --prefix PATH : "${cpio}/bin" '';
 
   meta = {
     license = "GPLv2";
     homepage = http://git.or.cz;
-    description = ''Git, a popular distributed version control system
-                    designed to handle very large projects with speed
-		    and efficiency.'';
+    description = "Git, a popular distributed version control system";
+
+    longDescription = ''
+      Git, a popular distributed version control system designed to
+      handle very large projects with speed and efficiency.
+    '';
+
   };
 }
diff --git a/pkgs/applications/version-management/git/pwd.patch b/pkgs/applications/version-management/git/pwd.patch
new file mode 100644
index 00000000000..78c67043913
--- /dev/null
+++ b/pkgs/applications/version-management/git/pwd.patch
@@ -0,0 +1,22 @@
+--- git-1.5.4.4/git-clone.sh	2008-03-09 11:18:13.000000000 +0100
++++ git-1.5.4.4/git-clone.sh	2008-03-30 23:43:35.000000000 +0200
+@@ -40,7 +40,7 @@ eval "$(echo "$OPTIONS_SPEC" | git rev-p
+ 
+ get_repo_base() {
+ 	(
+-		cd "`/bin/pwd`" &&
++		cd "`pwd`" &&
+ 		cd "$1" || cd "$1.git" &&
+ 		{
+ 			cd .git
+--- git-1.5.4.4/git-submodule.sh	2008-03-09 11:18:13.000000000 +0100
++++ git-1.5.4.4/git-submodule.sh	2008-03-31 00:01:03.000000000 +0200
+@@ -28,7 +28,7 @@ say()
+ # NEEDSWORK: identical function exists in get_repo_base in clone.sh
+ get_repo_base() {
+ 	(
+-		cd "`/bin/pwd`" &&
++		cd "`pwd`" &&
+ 		cd "$1" || cd "$1.git" &&
+ 		{
+ 			cd .git
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2691a2b612..6ae71cc2ec9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5090,7 +5090,7 @@ let pkgs = rec {
     inherit fetchurl stdenv curl openssl zlib expat perl gettext
       asciidoc texinfo xmlto docbook2x
       docbook_xsl docbook_xml_dtd_42 libxslt
-      tcl tk makeWrapper;
+      cpio tcl tk makeWrapper;
     emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
   };