darwin-stdenv, cc-wrapper: Fix eval on darwin

Need to refer directly to `darwin.binutils` as on Linux, `binutils` doesn't take a `cctools` parameter. Persist `darwin.binutils` from the previous stage too, so no hashes change.
NixOS · Sep 14, 2017 · 446f185 · 446f185
1 parent 85cd273
commit 446f185
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
@@ -260,7 +260,7 @@ in rec {
     };
 
     darwin = super.darwin // {
-      inherit (darwin) dyld Libsystem cctools libiconv;
+      inherit (darwin) dyld Libsystem binutils cctools libiconv;
     };
   };
 

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -4786,7 +4786,7 @@ with pkgs;
   clang-sierraHack = clang.override {
     name = "clang-wrapper-with-reexport-hack";
     useMacosReexportHack = true;
-    binutils = binutils.override {
+    binutils = darwin.binutils.override {
       cctools = darwin.cctools.override {
         enableDumpNormalizedLibArgs = true;
       };