From 977d1d8413230bac31bb2b7ebb72ee30a3ca9d46 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 2 Apr 2019 22:42:59 +0200 Subject: [PATCH] nixos/fhsUserenv: make all locales available --- pkgs/build-support/build-fhs-userenv/env.nix | 8 +++++--- 1 file 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 c0f741b62886..be83c9da2108 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)