Merge pull request #58847 from bachp/fhs-locales

nixos/fhsUserenv: make all locales available
This commit is contained in:
Joachim F 2019-04-12 09:35:20 +00:00 committed by GitHub
commit de9b622eab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -36,12 +36,14 @@ let
# base packages of the chroot
# these match the host's architecture, glibc_multi is used for multilib
# builds.
# builds. glibcLocales must be before glibc or glibc_multi as otherwiese
# the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
basePkgs = with pkgs;
[ (if isMultiBuild then glibc_multi else glibc)
[ glibcLocales
(if isMultiBuild then glibc_multi else glibc)
(toString gcc.cc.lib) bashInteractive coreutils less shadow su
gawk diffutils findutils gnused gnugrep
gnutar gzip bzip2 xz glibcLocales
gnutar gzip bzip2 xz
];
baseMultiPkgs = with pkgsi686Linux;
[ (toString gcc.cc.lib)