diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-28 06:57:12 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-28 06:59:36 +0100 |
commit | a33fcc873110a6ded62f3286d9850ac5a445df89 (patch) | |
tree | cf393c00f0e311b9ddfda0a2f8e748905966be7e | |
parent | 21bebe15920dbcab0c9a068a05ec137e82f5740e (diff) | |
download | nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar.gz nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar.bz2 nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar.lz nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar.xz nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.tar.zst nixlib-a33fcc873110a6ded62f3286d9850ac5a445df89.zip |
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.
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 |