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

glibc: add support for C.utf-8

Browse Source
This commit is contained in:
Jörg Thalheim 2019-01-22 22:08:44 +00:00
parent 5e24fccba4
commit d966f31f23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glibc/common.nix
View File

@ -87,6 +87,11 @@ stdenv.mkDerivation ({
less linux-*?/arch/x86/kernel/syscall_table_32.S less linux-*?/arch/x86/kernel/syscall_table_32.S
*/ */
./allow-kernel-2.6.32.patch ./allow-kernel-2.6.32.patch
/* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */
(fetchurl {
url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff";
sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4";
})
] ]
++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch;

5
pkgs/development/libraries/glibc/default.nix
View File

@ -56,9 +56,8 @@ callPackage ./common.nix { inherit stdenv; } {
''; '';
postInstall = '' postInstall = ''
if test -n "$installLocales"; then echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales
fi
test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache