Merge pull request #43985 from snaar/fix-lesspipe-dependency

lesspipe: add missing dependency on 'file'
This commit is contained in:
Jörg Thalheim 2018-07-30 09:46:06 +01:00 committed by GitHub
commit c5d1f7723b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 1 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl }:
{ stdenv, fetchFromGitHub, substituteAll, perl, file, ncurses }:
stdenv.mkDerivation rec {
name = "lesspipe-${version}";
@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
sha256 = "0vb7bpap8vy003ha10hc7hxl17y47sgdnrjpihgqxkn8k0bfqbbq";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
file = "${file}/bin/file";
tput = "${ncurses}/bin/tput";
})
];
meta = with stdenv.lib; {
description = "A preprocessor for less";
longDescription = ''

View file

@ -0,0 +1,22 @@
--- a/lesspipe.sh.in
+++ b/lesspipe.sh.in
@@ -48,8 +48,8 @@ if [[ "$LESS_ADVANCED_PREPROCESSOR" = '' ]]; then
fi
filecmd() {
- file -L -s "$@"
- file -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
+ @file@ -L -s "$@"
+ @file@ -L -s -i "$@" 2> /dev/null | sed -n 's/.*charset=/;/p' | tr a-z A-Z
}
sep=: # file name separator
@@ -546,7 +546,7 @@ isfinal() {
# color requires -r or -R when calling less
typeset COLOR
- if [[ $(tput colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
+ if [[ $(@tput@ colors) -ge 8 && ("$LESS" = *-*r* || "$LESS" = *-*R*) ]]; then
COLOR="--color=always"
fi