diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-01-22 22:08:44 +0000 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2019-01-22 22:08:44 +0000 |
| commit | d966f31f23b5cb37c0e6bd8553f8503c0465f205 (patch) | |
| tree | 498dfec57955b530201c4c18af20bc017ed40cf4 /pkgs/development/libraries/glibc | |
| parent | 5e24fccba45a7c72aff47cdbe305182352623124 (diff) | |
| download | nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar.gz nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar.bz2 nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar.lz nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar.xz nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.tar.zst nixpkgs-d966f31f23b5cb37c0e6bd8553f8503c0465f205.zip | |
glibc: add support for C.utf-8
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 2e06af2c594..7e99a0c18d7 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -87,6 +87,11 @@ stdenv.mkDerivation ({ less linux-*?/arch/x86/kernel/syscall_table_32.S */ ./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.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch; diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 5d04337f732..e46985d3fca 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -56,9 +56,8 @@ callPackage ./common.nix { inherit stdenv; } { ''; postInstall = '' - if test -n "$installLocales"; then - make -j''${NIX_BUILD_CORES:-1} -l''${NIX_BUILD_CORES:-1} localedata/install-locales - fi + 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 test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache |