MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glibcLocales, glibcLocalesUtf8: only define non-null on linux-glibc

Browse source 
Before the change glibcLocales was pulled in on musl (built successfully
but was not needed: musl does not know how to load glibc locales) and
on android (failed build there). Android failed eval due to the
headers -> zip -> libc recursion.

The change limits glibcLocales down to linux && gnu to target linux-glibc.
This commit is contained in:
Sergei Trofimovich 2022-07-13 20:07:50 +01:00
parent bee8b6b389
commit 38134efc76
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -17869,13 +17869,13 @@ with pkgs;
relibc = callPackage ../development/libraries/relibc { };
# Only supported on Linux
# Only supported on Linux and only on glibc
glibcLocales =
if stdenv.hostPlatform.isLinux
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu
then callPackage ../development/libraries/glibc/locales.nix { }
else null;
glibcLocalesUtf8 =
if stdenv.hostPlatform.isLinux
if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu
then callPackage ../development/libraries/glibc/locales.nix { allLocales = false; }
else null;