diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-06-05 17:19:30 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-06-05 17:19:30 +0000 |
| commit | eb8b534173511e29c2ca58410b10863a434932a3 (patch) | |
| tree | e326ee01c7eb239d4328037062bdfe9463016d22 /modules/programs | |
| parent | dbe229f3aac983750c405b30c2b487bba765d747 (diff) | |
| download | nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar.gz nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar.bz2 nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar.lz nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar.xz nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.tar.zst nixpkgs-eb8b534173511e29c2ca58410b10863a434932a3.zip | |
* Include only the en_US locale on the CD. This saves 75 MiB or so.
svn path=/nixos/branches/modular-nixos/; revision=15883
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash/bash.nix | 1 | ||||
| -rw-r--r-- | modules/programs/bash/bashrc.sh | 3 | ||||
| -rw-r--r-- | modules/programs/info.nix | 5 |
3 files changed, 5 insertions, 4 deletions
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 + ''; } |