diff options
| author | Domen Kožar <domen@dev.si> | 2014-09-08 21:19:02 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-09-08 21:19:14 +0200 |
| commit | 1849840aa3d967ea9b943d79a7b56860570fd28a (patch) | |
| tree | 44564930dc649d44c5d6c11ceea3d80e59d12703 /pkgs/applications/version-management | |
| parent | dd3192f5ee8b608d7bc4948cd4493c5db5b3caa2 (diff) | |
| download | nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar.gz nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar.bz2 nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar.lz nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar.xz nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.tar.zst nixlib-1849840aa3d967ea9b943d79a7b56860570fd28a.zip | |
fixes #1923
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index fd548296220e..c5024212c011 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 openssh; texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 877c65afccf5..2867d0341df9 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio, gnugrep, gzip , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 -, libxslt, tcl, tk, makeWrapper +, libxslt, tcl, tk, makeWrapper, openssh , svnSupport, subversionClient, perlLibs, smtpPerlLibs , guiSupport , withManual ? true @@ -26,7 +26,7 @@ stdenv.mkDerivation { patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; - buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper openssh] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; @@ -59,6 +59,9 @@ stdenv.mkDerivation { popd rm -rf contrib/subtree + # Wrap git to be able to find ssh + wrapProgram $out/bin/git --prefix PATH ":" "${openssh}/bin" + # Install contrib stuff. mkdir -p $out/share/git mv contrib $out/share/git/ |