public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-wrapper: attempt to fix on darwin

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2016-01-28 06:57:12 +01:00
parent 21bebe1592
commit a33fcc8731
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/cc-wrapper/default.nix
View File

@ -30,7 +30,7 @@ let
libc_dev = if nativeLibc then null else libc.dev or libc; libc_dev = if nativeLibc then null else libc.dev or libc;
libc_lib = if nativeLibc then null else libc.out or libc; libc_lib = if nativeLibc then null else libc.out or libc;
cc_solib = cc.lib or cc; 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. # The wrapper scripts use 'cat', so we may need coreutils.
coreutils_bin = if nativeTools then null else coreutils.bin or coreutils; coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
in in