From a78d164b1e6c10f39c87b8907685a711a6de338c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 17 Feb 2015 22:30:59 -0500
Subject: Minor fixes for git on darwin (libiconv and Security dependencies)

---
 pkgs/applications/version-management/git-and-tools/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications/version-management/git-and-tools/default.nix')

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 523e121b471..a313a566c4e 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -8,7 +8,7 @@ let
   gitBase = lib.makeOverridable (import ./git) {
     inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
       asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
-      tk makeWrapper subversionClient gzip;
+      tk makeWrapper subversionClient gzip libiconv;
     texinfo = texinfo5;
     svnSupport = false;		# for git-svn support
     guiSupport = false;		# requires tcl/tk
@@ -73,6 +73,7 @@ rec {
   hub = import ./hub {
     inherit go;
     inherit stdenv fetchgit;
+    inherit (darwin) Security;
   };
 
   gitFastExport = import ./fast-export {
-- 
cgit 1.4.1