ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 22:11:45 +03:00
Code Issues Projects Releases Wiki Activity

Merge #79738: glibc, openssl: unbreak cross eval

Browse Source 
(with minor caveats)
This commit is contained in:
Vladimír Čunát 2020-02-10 19:22:15 +01:00
commit e94a7366e7
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glibc/common.nix
View File

@ -111,6 +111,10 @@ stdenv.mkDerivation ({
# nscd needs libgcc, and we don't want it dynamically linked # nscd needs libgcc, and we don't want it dynamically linked
# because we don't want it to depend on bootstrap-tools libs. # because we don't want it to depend on bootstrap-tools libs.
echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile 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. # Ensure that libidn2 is found.
patch -p 1 <<EOF patch -p 1 <<EOF

4
pkgs/development/libraries/openssl/default.nix
View File

@ -36,7 +36,9 @@ let
outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc";
setOutputFlags = false; setOutputFlags = false;
separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false)
&& stdenv.hostPlatform == stdenv.buildPlatform # unable to fix infinite recursion on stdenv.cc
&& stdenv.cc.isGNU;
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
buildInputs = stdenv.lib.optional withCryptodev cryptodev; buildInputs = stdenv.lib.optional withCryptodev cryptodev;