From 58ae62b9fade252ba5679e924f26b592b4b611ad Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 2 Jan 2015 14:39:50 -0600
Subject: [PATCH] hub: add git as a dependency of the expression

---
 .../applications/version-management/git-and-tools/default.nix | 1 +
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 71fb75a2157..3714df5fb6b 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -75,6 +75,7 @@ rec {
   hub = import ./hub {
     inherit (rubyLibs) rake;
     inherit stdenv fetchurl groff makeWrapper;
+    git = gitBase;
   };
 
   gitFastExport = import ./fast-export {
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 8d578c2b466..827fdb1fa8e 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, groff, rake, makeWrapper }:
+{ stdenv, fetchurl, git, groff, rake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   fixupPhase = ''
-    wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin
+    wrapProgram $out/bin/hub --prefix PATH : ${groff}/bin:${git}/bin
   '';
 
   meta = {