From 00a41ebbc15b2345819612b8f917e1d69d853f5a Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Tue, 26 Feb 2019 18:17:31 +0100 Subject: [PATCH] glibc: fix cross builds on Darwin evaluate buildPackages.glibc exclusively on Linux, evaluating it on Darwin will lead to an unsupported platform error --- pkgs/development/libraries/glibc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 561f8d255ce..444d6c458fb 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -59,7 +59,7 @@ callPackage ./common.nix { inherit stdenv; } { postInstall = (if stdenv.hostPlatform == stdenv.buildPlatform 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 - '' else '' + '' else stdenv.lib.optionalString stdenv.buildPlatform.isLinux '' # This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html # Instead of using their patch to build a build-native localedef, # we simply use the one from buildPackages