public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #58847 from bachp/fhs-locales

Browse Source 
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
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/build-support/build-fhs-userenv/env.nix
View File

@ -36,12 +36,14 @@ let
# base packages of the chroot # base packages of the chroot
# these match the host's architecture, glibc_multi is used for multilib # 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; 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 (toString gcc.cc.lib) bashInteractive coreutils less shadow su
gawk diffutils findutils gnused gnugrep gawk diffutils findutils gnused gnugrep
gnutar gzip bzip2 xz glibcLocales gnutar gzip bzip2 xz
]; ];
baseMultiPkgs = with pkgsi686Linux; baseMultiPkgs = with pkgsi686Linux;
[ (toString gcc.cc.lib) [ (toString gcc.cc.lib)