diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-26 00:06:11 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-22 17:52:28 -0400 |
| commit | 9bfd03eff78aa37bff9a7f4cb12c6bed1f04e764 (patch) | |
| tree | 8856697b8729d2080d529c9d92a0d3e9db9670d6 /pkgs/stdenv/cross | |
| parent | 121e7d9335187fa742abba7994e03b495b8f2a6c (diff) | |
cross stdenv adaptor: Remove `ccCross` `binutils` attrs and binutils extra buildDepends
It now has the correct wrapped tools and nothing else is needed.
Diffstat (limited to 'pkgs/stdenv/cross')
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 7fe567251708..f9c23078cd30 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -31,15 +31,12 @@ in bootStages ++ [ targetPlatform = crossSystem; inherit config overlays; selfBuild = false; - stdenv = if crossSystem.useiOSCross or false - then let - inherit (buildPackages.darwin.ios-cross) cc binutils; - in buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - binutils cc - else buildPackages.makeStdenvCross - buildPackages.stdenv crossSystem - buildPackages.binutils buildPackages.gccCrossStageFinal; + stdenv = buildPackages.makeStdenvCross + buildPackages.stdenv + crossSystem + (if crossSystem.useiOSCross or false + then buildPackages.darwin.ios-cross + else buildPackages.gccCrossStageFinal); }) ] |