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

Merge pull request #5750 from rycee/issue/5741 

Wrap 'tig' command to add with git to PATH.
This commit is contained in:
lethalman 2015-01-28 14:52:45 +01:00
parent 057eac65d9 db01e50f6a
commit 2140080b08
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -68,9 +68,7 @@ rec {
inherit stdenv fetchurl; inherit stdenv fetchurl;
}; };
tig = import ./tig { tig = callPackage ./tig { };
inherit stdenv fetchurl ncurses asciidoc xmlto docbook_xsl docbook_xml_dtd_45 readline;
};
hub = import ./hub { hub = import ./hub {
inherit go; inherit go;

9
pkgs/applications/version-management/git-and-tools/tig/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
, readline , readline, makeWrapper, git
}: }:
stdenv.mkDerivation rec { 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 = '' preConfigure = ''
export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml' export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml'
''; '';
enableParallelBuilding = true;
installPhase = '' installPhase = ''
make install make install
make install-doc make install-doc
mkdir -p $out/etc/bash_completion.d/ mkdir -p $out/etc/bash_completion.d/
cp contrib/tig-completion.bash $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; { meta = with stdenv.lib; {