From eb8b534173511e29c2ca58410b10863a434932a3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 5 Jun 2009 17:19:30 +0000 Subject: * Include only the en_US locale on the CD. This saves 75 MiB or so. svn path=/nixos/branches/modular-nixos/; revision=15883 --- modules/programs/bash/bash.nix | 1 - modules/programs/bash/bashrc.sh | 3 --- modules/programs/info.nix | 5 +++++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/programs') diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix index 205cadea7f3..f7ac48ccb28 100644 --- a/modules/programs/bash/bash.nix +++ b/modules/programs/bash/bash.nix @@ -33,7 +33,6 @@ in systemPath = config.system.path; wrapperDir = config.security.wrapperDir; modulesTree = config.system.modulesTree; - defaultLocale = config.i18n.defaultLocale; shellInit = config.environment.shellInit; }; target = "bashrc"; diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index d18cb010b50..92ca71100ee 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -5,11 +5,8 @@ export MODULE_DIR=@modulesTree@/lib/modules export NIXPKGS_CONFIG=/nix/etc/config.nix export NIXPKGS_ALL=/etc/nixos/nixpkgs export PAGER="less -R" -export LANG=@defaultLocale@ export EDITOR=nano -export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info export LOCATE_PATH=/var/cache/locatedb -export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive @shellInit@ diff --git a/modules/programs/info.nix b/modules/programs/info.nix index e3b8025f933..a12aef6a7d0 100644 --- a/modules/programs/info.nix +++ b/modules/programs/info.nix @@ -33,4 +33,9 @@ in { environment.systemPackages = [infoWrapper]; + + environment.shellInit = + '' + export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info + ''; } -- cgit 1.4.1