diff options
| author | Domen Kožar <domen@dev.si> | 2014-09-09 12:11:53 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-09-09 12:11:53 +0200 |
| commit | 78e5e556ccea2ba6bb0a421b8a770b6296eb6915 (patch) | |
| tree | 5a40c11e827c868efdc123c0b79ab00ed1c4eb30 /pkgs | |
| parent | a654c7db38515148598b57836348fda296f3bef0 (diff) | |
| download | nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar.gz nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar.bz2 nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar.lz nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar.xz nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.tar.zst nixpkgs-78e5e556ccea2ba6bb0a421b8a770b6296eb6915.zip | |
Revert "fixes #1923"
This reverts commit 1849840aa3d967ea9b943d79a7b56860570fd28a. Breaks git-annex
Diffstat (limited to 'pkgs')
| -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, 3 insertions, 6 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index c5024212c01..fd548296220 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 openssh; + tk makeWrapper subversionClient gzip; 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 2867d0341df..877c65afccf 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, openssh +, libxslt, tcl, tk, makeWrapper , 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 openssh] + buildInputs = [curl openssl zlib expat gettext cpio makeWrapper] ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt ] ++ stdenv.lib.optionals guiSupport [tcl tk]; @@ -59,9 +59,6 @@ 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/ |