Merge remote-tracking branch 'origin/master' into staging

pkgs/stdenv/custom/default.nix

@@ -1,5 +1,5 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 }:
 
 assert crossSystem == localSystem;

pkgs/stdenv/darwin/make-bootstrap-tools.nix

@@ -98,7 +98,7 @@ in rec {
       cp -d ${xz.out}/lib/liblzma*.*     $out/lib
 
       # Copy binutils.
-      for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do
+      for i in as ld ar ranlib nm strip otool install_name_tool lipo; do
         cp ${cctools_}/bin/$i $out/bin
       done