public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes for git on darwin (libiconv and Security dependencies)

Browse Source
This commit is contained in:
Dan Peebles 2015-02-17 22:30:59 -05:00
parent a68484a0ac
commit a78d164b1e
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -8,7 +8,7 @@ let
gitBase = lib.makeOverridable (import ./git) { gitBase = lib.makeOverridable (import ./git) {
inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep inherit fetchurl stdenv curl openssl zlib expat perl python gettext gnugrep
asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
tk makeWrapper subversionClient gzip; tk makeWrapper subversionClient gzip libiconv;
texinfo = texinfo5; texinfo = texinfo5;
svnSupport = false; # for git-svn support svnSupport = false; # for git-svn support
guiSupport = false; # requires tcl/tk guiSupport = false; # requires tcl/tk
@ -73,6 +73,7 @@ rec {
hub = import ./hub { hub = import ./hub {
inherit go; inherit go;
inherit stdenv fetchgit; inherit stdenv fetchgit;
inherit (darwin) Security;
}; };
gitFastExport = import ./fast-export { gitFastExport = import ./fast-export {

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
, libxslt, tcl, tk, makeWrapper , libxslt, tcl, tk, makeWrapper, libiconv
, svnSupport, subversionClient, perlLibs, smtpPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport , guiSupport
, withManual ? true , withManual ? true
@ -31,7 +31,7 @@ stdenv.mkDerivation {
./ssl-cert-file.patch ./ssl-cert-file.patch
]; ];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_45 libxslt ] docbook_xsl docbook_xml_dtd_45 libxslt ]
++ stdenv.lib.optionals guiSupport [tcl tk]; ++ stdenv.lib.optionals guiSupport [tcl tk];

6
pkgs/applications/version-management/git-and-tools/hub/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, go }: { stdenv, fetchgit, go, Security }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hub-${version}"; name = "hub-${version}";
@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm"; sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm";
}; };
buildInputs = [ go ];
buildInputs = [ go ] ++ stdenv.lib.optional stdenv.isDarwin Security;
phases = [ "unpackPhase" "buildPhase" "installPhase" ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ];
buildPhase = '' buildPhase = ''
patchShebangs .
sh script/build sh script/build
''; '';