1
1
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-08-17 00:20:44 +03:00

Merge pull request #553 from n8henrie/issue_543

Add system terminfo to TERMINFO_DIRS by default
This commit is contained in:
Domen Kožar 2022-11-15 17:44:04 +00:00 committed by GitHub
commit 4182ad42d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions

View File

@ -177,7 +177,7 @@ in
{
XDG_CONFIG_DIRS = map (path: path + "/etc/xdg") cfg.profiles;
XDG_DATA_DIRS = map (path: path + "/share") cfg.profiles;
TERMINFO_DIRS = map (path: path + "/share/terminfo") cfg.profiles;
TERMINFO_DIRS = map (path: path + "/share/terminfo") cfg.profiles ++ [ "/usr/share/terminfo" ];
EDITOR = mkDefault "nano";
PAGER = mkDefault "less -R";
};

View File

@ -101,6 +101,7 @@ let
tests.autossh = makeTest ./tests/autossh.nix;
tests.checks-nix-gc = makeTest ./tests/checks-nix-gc.nix;
tests.environment-path = makeTest ./tests/environment-path.nix;
tests.environment-terminfo = makeTest ./tests/environment-terminfo.nix;
tests.homebrew = makeTest ./tests/homebrew.nix;
tests.launchd-daemons = makeTest ./tests/launchd-daemons.nix;
tests.launchd-setenv = makeTest ./tests/launchd-setenv.nix;

View File

@ -0,0 +1,10 @@
{ config, lib, pkgs, ... }:
with lib;
{
test = ''
echo checking /usr/share/terminfo in environment >&2
grep 'export TERMINFO_DIRS=.*:/usr/share/terminfo' ${config.system.build.setEnvironment}
'';
}