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

bat: insert less into PATH

Browse Source 
The default pager for `bat` is `less -RF --no-init`. Overriding this to
`less -RF` in order to enable alternate screen behavior (e.g. page
up/down keys) causes the `-F` flag to behave badly in the version of
`less` shipped on macOS. The simplest way to fix this is to simply put
Nix's `less` into the `PATH` so it takes precedence.
This commit is contained in:
Lily Ballard 2019-12-22 17:25:31 -08:00
parent 7887a81193
commit 8a9fb54f07
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/misc/bat/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig { stdenv, rustPlatform, fetchFromGitHub, llvmPackages, pkgconfig, less
, Security, libiconv, installShellFiles , Security, libiconv, installShellFiles, makeWrapper
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2"; cargoSha256 = "0d7h0kn41w6wm4w63vjy2i7r19jkansfvfjn7vgh2gqh5m60kal2";
nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles ]; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security libiconv ];
@ -27,6 +27,13 @@ rustPlatform.buildRustPackage rec {
installShellCompletion assets/completions/bat.fish installShellCompletion assets/completions/bat.fish
''; '';
# Insert Nix-built `less` into PATH because the system-provided one may be too old to behave as
# expected with certain flag combinations.
postFixup = ''
wrapProgram "$out/bin/bat" \
--prefix PATH : "${stdenv.lib.makeBinPath [ less ]}"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A cat(1) clone with syntax highlighting and Git integration"; description = "A cat(1) clone with syntax highlighting and Git integration";
homepage = https://github.com/sharkdp/bat; homepage = https://github.com/sharkdp/bat;