Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.

pkgs/development/tools/misc/binutils/default.nix

@@ -2,6 +2,8 @@
 , cross ? null, gold ? true, bison ? null
 }:
 
+assert !stdenv.isDarwin;
+
 let basename = "binutils-2.23.1"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -36,9 +38,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "info" ];
 
-  buildInputs =
-    [ zlib ]
-    ++ optional gold bison;
+  nativeBuildInputs = optional gold bison;
+  buildInputs = [ zlib ];
 
   inherit noSysDirs;