From c2038483fda492591c2c08d07cdc1d8f59aaffd9 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Mon, 10 Feb 2020 15:52:20 +0100 Subject: glibc, openssl: unbreak cross eval (with minor caveats) It's certainly better to have those two caveats than not evaluate. Both seem rather niche. Unfortunately I failed to find a better way. I started testing builds of several cross variants; all seem OK. --- pkgs/development/libraries/glibc/common.nix | 4 ++++ pkgs/development/libraries/openssl/default.nix | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 9ea943816596..7ccba0072e28 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -111,6 +111,10 @@ stdenv.mkDerivation ({ # nscd needs libgcc, and we don't want it dynamically linked # because we don't want it to depend on bootstrap-tools libs. echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile + '' + # FIXME: find a solution for infinite recursion in cross builds. + # For now it's hopefully acceptable that IDN from libc doesn't reliably work. + + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Ensure that libidn2 is found. patch -p 1 <