summary refs log tree commit diff
path: root/nixos/modules/config
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-05-24 11:13:46 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2016-05-24 11:13:46 +0200
commit493cae87567b298c1100c284b48cc74faccbc9eb (patch)
treec626a75ba18a9b85b344e170acfcdba60675551f /nixos/modules/config
parenta21df566e4ccd5b9a1c243ba387055b5d50c4014 (diff)
downloadnixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar.gz
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar.bz2
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar.lz
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar.xz
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.tar.zst
nixlib-493cae87567b298c1100c284b48cc74faccbc9eb.zip
Revert "Merge pull request #15384 from Shados/fix-preshell-terminfo"
This reverts commit 4e9833d9e8e7bb449ca897d1f7e9db48fbf8aa53, reversing
changes made to 6194e9d801d31d6241deb5c6dc534975887f143d.

Setting TERMINFO prevents ncurses from reading TERMINFO_DIRS.  See
https://github.com/NixOS/nixpkgs/pull/15384#issuecomment-221205596
Diffstat (limited to 'nixos/modules/config')
-rw-r--r--nixos/modules/config/shells-environment.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 89b8a04b5e7c..9642981803bf 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -150,10 +150,6 @@ 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