From a33fcc873110a6ded62f3286d9850ac5a445df89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Thu, 28 Jan 2016 06:57:12 +0100 Subject: [PATCH] cc-wrapper: attempt to fix on darwin This fixes evaluation at least. I'm unable to test this myself and noone steps up; https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-174448705 however, Hydra's macs are idling so let's employ them for that. --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4aeac5d75aae..2eadb89e0c16 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -30,7 +30,7 @@ let libc_dev = if nativeLibc then null else libc.dev or libc; libc_lib = if nativeLibc then null else libc.out or libc; cc_solib = cc.lib or cc; - binutils_bin = if nativeTools then null else binutils.bin or binutils; + binutils_bin = if nativeTools then "$binutils" else binutils.bin or binutils; # The wrapper scripts use 'cat', so we may need coreutils. coreutils_bin = if nativeTools then null else coreutils.bin or coreutils; in