diff options
| author | Pascal Bach <pascal.bach@nextrem.ch> | 2019-04-02 22:42:59 +0200 |
|---|---|---|
| committer | Pascal Bach <pascal.bach@nextrem.ch> | 2019-04-02 22:45:50 +0200 |
| commit | 977d1d8413230bac31bb2b7ebb72ee30a3ca9d46 (patch) | |
| tree | cf3bef2a221aca879c71c8b4be58c1aae58ca845 /pkgs/build-support/build-fhs-userenv | |
| parent | e23f1a227aadb2d779f84a65c8b5d9b02eac4527 (diff) | |
| download | nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar.gz nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar.bz2 nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar.lz nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar.xz nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.tar.zst nixpkgs-977d1d8413230bac31bb2b7ebb72ee30a3ca9d46.zip | |
nixos/fhsUserenv: make all locales available
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index c0f741b6288..be83c9da210 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -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) |