diff options
| author | Robert Helgesson <robert@rycee.net> | 2015-01-13 22:51:04 +0100 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2015-01-13 23:12:35 +0100 |
| commit | db01e50f6aa5a65814bf72008d08ebd1e55aab56 (patch) | |
| tree | 4837e52d057cc07e463cfb584044e8e173c804ae /pkgs/applications/version-management | |
| parent | 07966befeeabbe21426acc9c4fb0ccf74e470b1f (diff) | |
| download | nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar.gz nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar.bz2 nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar.lz nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar.xz nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.tar.zst nixpkgs-db01e50f6aa5a65814bf72008d08ebd1e55aab56.zip | |
Wrap 'tig' command to add with git to PATH.
This ensures that git is added as a run-time dependency of tig and allows tig to find the git command even if git is not installed in the user environment. Fixes #5741.
Diffstat (limited to 'pkgs/applications/version-management')
| -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 891c947e85b..fa175c3fb87 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 7e93893e7b1..4c82c96a7c1 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; { |