diff options
| author | Dan Peebles <pumpkin@me.com> | 2015-02-17 22:30:59 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2015-02-17 22:30:59 -0500 |
| commit | a78d164b1e6c10f39c87b8907685a711a6de338c (patch) | |
| tree | 3e6144f14a9f155e0daa51dd53fed5e252b20cc0 /pkgs/applications/version-management/git-and-tools/default.nix | |
| parent | a68484a0ac286e4c94a9cb692fea04c28ce82345 (diff) | |
| download | nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar.gz nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar.bz2 nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar.lz nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar.xz nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.tar.zst nixpkgs-a78d164b1e6c10f39c87b8907685a711a6de338c.zip | |
Minor fixes for git on darwin (libiconv and Security dependencies)
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
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 { |