From 38134efc76345f43efd8792ce4dc4a16f5621452 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 13 Jul 2022 20:07:50 +0100 Subject: [PATCH] glibcLocales, glibcLocalesUtf8: only define non-null on linux-glibc 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. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3ce352d912d..9209b47de3b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;