From 493cae87567b298c1100c284b48cc74faccbc9eb Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 24 May 2016 11:13:46 +0200 Subject: [PATCH] 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 --- nixos/modules/config/shells-environment.nix | 4 ---- 1 file changed, 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