diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-20 09:38:45 +0100 |
commit | 32767d139f28fd3c00d687c04ec406258f7341e7 (patch) | |
tree | b049aa5d798a9fa2555882c788592a0640928ba2 /pkgs/development/libraries/glibc | |
parent | 28d983fe25bcf853dfd38663f333d4c522f613cc (diff) | |
parent | e20188f181ca51882984daaee237a95f2fc5e7c9 (diff) |
Merge branch 'staging-next'
This round is without the systemd CVE, as we don't have binaries for that yet. BTW, I just ignore darwin binaries these days, as I'd have to wait for weeks for them.
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/locales.nix | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index e0fcf6f88c840..cb4571265af74 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -28,7 +28,6 @@ { name , withLinuxHeaders ? false , profilingLibraries ? false -, installLocales ? false , withGd ? false , meta , ... @@ -44,7 +43,7 @@ assert withLinuxHeaders -> linuxHeaders != null; assert withGd -> gd != null && libpng != null; stdenv.mkDerivation ({ - inherit version installLocales; + inherit version; linuxHeaders = if withLinuxHeaders then linuxHeaders else null; inherit (stdenv) is64bit; @@ -88,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 27a1267f0cfe1..e46985d3fca8b 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -1,6 +1,5 @@ { stdenv, callPackage , withLinuxHeaders ? true -, installLocales ? true , profilingLibraries ? false , withGd ? false }: @@ -8,7 +7,7 @@ callPackage ./common.nix { inherit stdenv; } { name = "glibc" + stdenv.lib.optionalString withGd "-gd"; - inherit withLinuxHeaders profilingLibraries installLocales withGd; + inherit withLinuxHeaders profilingLibraries withGd; # Note: # Things you write here override, and do not add to, @@ -57,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 diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix index 7090c5ceceeca..2b20c17d4500b 100644 --- a/pkgs/development/libraries/glibc/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -13,8 +13,6 @@ callPackage ./common.nix { inherit stdenv; } { name = "glibc-locales"; - installLocales = true; - builder = ./locales-builder.sh; outputs = [ "out" ]; |