diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-21 18:42:57 -0400 |
| commit | 0135e61b4c59357e01e0fda713e95402ea3a443c (patch) | |
| tree | daf7de4554407d52a44c94814d216dc3f16beb9a /pkgs/build-support | |
| parent | 221f5f00e30870dc4f1ea06e78b5e27b30ec9b16 (diff) | |
| parent | c03571107213331494fb5330fd2bb4129d19cdbc (diff) | |
| download | nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.gz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.bz2 nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.lz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.xz nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.tar.zst nixlib-0135e61b4c59357e01e0fda713e95402ea3a443c.zip | |
Merge remote-tracking branch 'upstream/master' into staging
That way the tarball job succeeds
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 502362514ebc..b3971808a2b4 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -8,10 +8,8 @@ { name ? "", stdenv, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell , zlib ? null, extraPackages ? [], extraBuildCommands ? "" -, dyld ? null # TODO: should this be a setup-hook on dyld? , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null -, buildPackages ? {}, hostPlatform, targetPlatform -, runCommand ? null +, buildPackages ? {} , useMacosReexportHack ? false }: |