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

fixes #1923

Browse Source
This commit is contained in:
Domen Kožar 2014-09-08 21:19:02 +02:00
parent dd3192f5ee
commit 1849840aa3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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 openssh;
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

7
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, openssh
, svnSupport, subversionClient, perlLibs, smtpPerlLibs , svnSupport, subversionClient, perlLibs, smtpPerlLibs
, guiSupport , guiSupport
, withManual ? true , withManual ? true
@ -26,7 +26,7 @@ stdenv.mkDerivation {
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ./cert-path.patch ]; 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 ++ 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];
@ -59,6 +59,9 @@ stdenv.mkDerivation {
popd popd
rm -rf contrib/subtree rm -rf contrib/subtree
# Wrap git to be able to find ssh
wrapProgram $out/bin/git --prefix PATH ":" "${openssh}/bin"
# Install contrib stuff. # Install contrib stuff.
mkdir -p $out/share/git mkdir -p $out/share/git
mv contrib $out/share/git/ mv contrib $out/share/git/