diff options
| author | Domen Kožar <domen@dev.si> | 2022-11-15 17:44:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-15 17:44:04 +0000 |
| commit | 4182ad42d5fb5001adb1f61bec3a04fae0eecb95 (patch) | |
| tree | d1bad84a5c3ca54478e1e13ce2bcde9d241284f9 | |
| parent | cfc0125eafadc9569d3d6a16ee928375b77e3100 (diff) | |
| parent | 6b73d2c605cd1a063931f722151d00dc1157275d (diff) | |
Merge pull request #553 from n8henrie/issue_543
Add system terminfo to TERMINFO_DIRS by default
| -rw-r--r-- | modules/environment/default.nix | 2 | ||||
| -rw-r--r-- | release.nix | 1 | ||||
| -rw-r--r-- | tests/environment-terminfo.nix | 10 |
3 files changed, 12 insertions, 1 deletions
diff --git a/modules/environment/default.nix b/modules/environment/default.nix index 28e33ca..1fed0f4 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -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"; }; diff --git a/release.nix b/release.nix index 4e5b093..56a0663 100644 --- a/release.nix +++ b/release.nix @@ -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; diff --git a/tests/environment-terminfo.nix b/tests/environment-terminfo.nix new file mode 100644 index 0000000..487859e --- /dev/null +++ b/tests/environment-terminfo.nix @@ -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} + ''; +} |