Remerge pull request #29517 from master into staging

NixOS · Sep 18, 2017 · cbdd77f · cbdd77f
2 parents b89c3af + 77bd631
commit cbdd77f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
@@ -294,7 +294,9 @@ in rec {
       };
 
       darwin = super.darwin // {
-        inherit (darwin) dyld ICU Libsystem cctools libiconv;
+        inherit (darwin) dyld ICU Libsystem libiconv;
+      } // lib.optionalAttrs (super.targetPlatform == localSystem) {
+        inherit (darwin) cctools;
       };
     } // lib.optionalAttrs (super.targetPlatform == localSystem) {
       # Need to get rid of these when cross-compiling.