summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorAlexei Robyn <shados@shados.net>2016-05-11 22:16:38 +1000
committerAlexei Robyn <shados@shados.net>2016-05-11 22:16:38 +1000
commitce7a544b92c5d22db028f5f3fe0d82e260a9ffd7 (patch)
tree16efc6f145ebb85bcee773db28dfadb37d471a06 /nixos
parent7abe192b05eea78610d6eea755a66fcb93a77b68 (diff)
downloadnixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar.gz
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar.bz2
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar.lz
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar.xz
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.tar.zst
nixlib-ce7a544b92c5d22db028f5f3fe0d82e260a9ffd7.zip
nixos: ensure TERMINFO is set before user shells are run
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/config/shells-environment.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 9642981803bf..89b8a04b5e7c 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -150,6 +150,10 @@ in
 
     system.build.binsh = pkgs.bashInteractive;
 
+    # Ensure TERMINFO is set appropriately *before* user shells are run,
+    # as they may depend on it
+    environment.sessionVariables.TERMINFO = "/run/current-system/sw/share/terminfo";
+
     # Set session variables in the shell as well. This is usually
     # unnecessary, but it allows changes to session variables to take
     # effect without restarting the session (e.g. by opening a new