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

nixos/less: use lesspipe package for preprocessing

Browse Source 
Rather than a custom script the less config now uses the lesspipe
package config by default.
This commit is contained in:
Daniel Schaefer 2018-01-29 22:08:32 +07:00
parent 192c2330d0
commit 288898d6f1
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
nixos/modules/programs/less.nix
View File

@ -28,24 +28,6 @@ let
{ src = pkgs.writeText "lessconfig" configFile; } { src = pkgs.writeText "lessconfig" configFile; }
"${pkgs.less}/bin/lesskey -o $out $src"; "${pkgs.less}/bin/lesskey -o $out $src";
lessPipe = pkgs.writeScriptBin "lesspipe.sh" ''
#! /bin/sh
case "$1" in
*.gz)
${pkgs.gzip}/bin/gunzip --stdout "$1" 2>/dev/null
;;
*.xz)
${pkgs.xz}/bin/unxz --stdout "$1" 2>/dev/null
;;
*.bz2)
${pkgs.bzip2}/bin/bunzip2 --stdout "$1" 2>/dev/null
;;
*) exit 1
;;
esac
exit $?
'';
in in
{ {
@ -93,11 +75,19 @@ in
description = "Defines environment variables."; description = "Defines environment variables.";
}; };
autoExtract = mkOption { lessopen = mkOption {
type = types.bool; type = types.nullOr types.str;
default = true; default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s";
description = '' description = ''
When enabled less automatically extracts .gz .xz .bz2 files before reading them. Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed.
'';
};
lessclose = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN).
''; '';
}; };
}; };
@ -107,8 +97,13 @@ in
environment.systemPackages = [ pkgs.less ]; environment.systemPackages = [ pkgs.less ];
environment.variables."LESSKEY_SYSTEM" = toString lessKey; environment.variables = {
environment.variables."LESSOPEN" = "|${lessPipe}/bin/lesspipe.sh %s"; "LESSKEY_SYSTEM" = toString lessKey;
} // optionalAttrs (cfg.lessopen != null) {
"LESSOPEN" = cfg.lessopen;
} // optionalAttrs (cfg.lessclose != null) {
"LESSCLOSE" = cfg.lessclose;
};
warnings = optional ( warnings = optional (
cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands)) cfg.clearDefaultCommands && (all (x: x != "quit") (attrValues cfg.commands))