diff options
| author | lethalman <lucabru@src.gnome.org> | 2015-01-28 14:52:45 +0100 |
|---|---|---|
| committer | lethalman <lucabru@src.gnome.org> | 2015-01-28 14:52:45 +0100 |
| commit | 2140080b08570db7fcfce2b5e674309a035f0ba1 (patch) | |
| tree | b25b1d01e51f75171db083269c83a75487f8b910 /pkgs/applications/version-management/git-and-tools | |
| parent | 057eac65d9e724e503be5b0e1c1e17fb394f1ec6 (diff) | |
| parent | db01e50f6aa5a65814bf72008d08ebd1e55aab56 (diff) | |
| download | nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar.gz nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar.bz2 nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar.lz nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar.xz nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.tar.zst nixlib-2140080b08570db7fcfce2b5e674309a035f0ba1.zip | |
Merge pull request #5750 from rycee/issue/5741
Wrap 'tig' command to add with git to PATH.
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
| -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 2d1a84d494a6..523e121b4711 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; { |