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

terminfo: symlink terminfo to /etc for ncurses

Browse Source
This commit is contained in:
Guillaume Maudoux 2017-06-27 10:57:44 +02:00
parent d61c22341b
commit bd562949cf
5 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/config/system-path.nix
View File

@ -115,7 +115,6 @@ in
"/share/mime" "/share/mime"
"/share/nano" "/share/nano"
"/share/org" "/share/org"
"/share/terminfo"
"/share/themes" "/share/themes"
"/share/vim-plugins" "/share/vim-plugins"
"/share/vulkan" "/share/vulkan"

33
nixos/modules/config/terminfo.nix Normal file
View File

@ -0,0 +1,33 @@
# This module manages the terminfo database
# and its integration in the system.
{ config, ... }:
{
config = {
environment.pathsToLink = [
"/share/terminfo"
];
environment.etc."terminfo" = {
source = "${config.system.path}/share/terminfo";
};
environment.profileRelativeEnvVars = {
TERMINFO_DIRS = [ "/share/terminfo" ];
};
environment.extraInit = ''
# reset TERM with new TERMINFO available (if any)
export TERM=$TERM
'';
security.sudo.extraConfig = ''
# Keep terminfo database for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
Defaults:root,%wheel env_keep+=TERMINFO
'';
};
}

1
nixos/modules/module-list.nix
View File

@ -21,6 +21,7 @@
./config/sysctl.nix ./config/sysctl.nix
./config/system-environment.nix ./config/system-environment.nix
./config/system-path.nix ./config/system-path.nix
./config/terminfo.nix
./config/timezone.nix ./config/timezone.nix
./config/unix-odbc-drivers.nix ./config/unix-odbc-drivers.nix
./config/users-groups.nix ./config/users-groups.nix

4
nixos/modules/programs/environment.nix
View File

@ -34,7 +34,6 @@ in
{ PATH = [ "/bin" ]; { PATH = [ "/bin" ];
INFOPATH = [ "/info" "/share/info" ]; INFOPATH = [ "/info" "/share/info" ];
PKG_CONFIG_PATH = [ "/lib/pkgconfig" ]; PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
TERMINFO_DIRS = [ "/share/terminfo" ];
PERL5LIB = [ "/lib/perl5/site_perl" ]; PERL5LIB = [ "/lib/perl5/site_perl" ];
KDEDIRS = [ "" ]; KDEDIRS = [ "" ];
STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ]; STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
@ -50,9 +49,6 @@ in
environment.extraInit = environment.extraInit =
'' ''
# reset TERM with new TERMINFO available (if any)
export TERM=$TERM
unset ASPELL_CONF unset ASPELL_CONF
for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do for i in ${concatStringsSep " " (reverseList cfg.profiles)} ; do
if [ -d "$i/lib/aspell" ]; then if [ -d "$i/lib/aspell" ]; then

4
nixos/modules/security/sudo.nix
View File

@ -66,10 +66,6 @@ in
# Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’
# or ‘security.sudo.extraConfig’ instead. # or ‘security.sudo.extraConfig’ instead.
# Environment variables to keep for root and %wheel.
Defaults:root,%wheel env_keep+=TERMINFO_DIRS
Defaults:root,%wheel env_keep+=TERMINFO
# Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic.
Defaults env_keep+=SSH_AUTH_SOCK Defaults env_keep+=SSH_AUTH_SOCK