about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@users.noreply.github.com>2016-05-14 06:21:25 +0200
committerJoachim Fasting <joachifm@users.noreply.github.com>2016-05-14 06:21:25 +0200
commit4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53 (patch)
treee77eaf531fd0bb77121d2f439ddec7fe44cfa667
parent6194e9d801d31d6241deb5c6dc534975887f143d (diff)
parentce7a544b92c5d22db028f5f3fe0d82e260a9ffd7 (diff)
downloadnixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar.gz
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar.bz2
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar.lz
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar.xz
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.tar.zst
nixlib-4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53.zip
Merge pull request #15384 from Shados/fix-preshell-terminfo
nixos: ensure TERMINFO is set before user shells are run
-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