diff options
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/tig/default.nix | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 891c947e85be..fa175c3fb87a 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -68,9 +68,7 @@ rec { inherit stdenv fetchurl; }; - tig = import ./tig { - inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45 readline; - }; + tig = callPackage ./tig { }; hub = import ./hub { inherit go; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 7e93893e7b1e..4c82c96a7c13 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 -, readline +, readline, makeWrapper, git }: stdenv.mkDerivation rec { @@ -11,17 +11,22 @@ stdenv.mkDerivation rec { }; - buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline ]; + buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]; preConfigure = '' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' ''; + enableParallelBuilding = true; + installPhase = '' make install make install-doc mkdir -p $out/etc/bash_completion.d/ cp contrib/tig-completion.bash $out/etc/bash_completion.d/ + + wrapProgram $out/bin/tig \ + --prefix PATH ':' "${git}/bin" ''; meta = with stdenv.lib; { |