From a06a405d0bf57699a8fb9976c6acae08641852cc Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 1 Jun 2016 23:01:24 +0300 Subject: cross GCC: Fix some paths to libc headers (after multiple outputs) It's not completely clear to me why the path to libc headers is set differently when cross building... --- pkgs/build-support/gcc-cross-wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/build-support/gcc-cross-wrapper/default.nix') diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index fe2a530e1e8e..505d80a6b2ac 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix gcc binutils; libc = if libc ? out then libc.out else libc; + libc_dev = if libc ? dev then libc.dev else libc; crossConfig = if cross != null then cross.config else null; osxMinVersion = cross.osxMinVersion or null; gccLibs = if gcc != null then gccLibs else null; -- cgit 1.4.1