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/libraries/libffi/default.nix

@@ -1,42 +1,39 @@
 { fetchurl, stdenv, dejagnu }:
 
 stdenv.mkDerivation rec {
-  name = "libffi-3.0.13";
+  name = "libffi-3.2.1";
 
   src = fetchurl {
     url = "ftp://sourceware.org/pub/libffi/${name}.tar.gz";
-    sha256 = "077ibkf84bvcd6rw1m6jb107br63i2pp301rkmsbgg6300adxp8x";
+    sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 
-  patches = stdenv.lib.optional (stdenv.needsPax) ./libffi-3.0.13-emutramp_pax_proc.patch;
-
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [ ]
-    ++ stdenv.lib.optional doCheck dejagnu;
+  buildInputs = stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = [
     "--with-gcc-arch=generic" # no detection of -march= or -mtune=
-  ] ++ stdenv.lib.optional (stdenv.needsPax) "--enable-pax_emutramp";
+    "--enable-pax_emutramp"
+  ];
 
   doCheck = stdenv.isLinux; # until we solve dejagnu problems on darwin and expect on BSD
 
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
-  postInstall =
-    # Install headers and libs in the right places.
-    ''  mv "$out"/lib64/* "$out/lib"
-        rmdir "$out/lib64"
-        ln -s lib "$out/lib64"
+  # Install headers and libs in the right places.
+  postInstall = ''
+    mv "$out"/lib64/* "$out/lib"
+    rmdir "$out/lib64"
+    ln -s lib "$out/lib64"
 
-        mkdir -p "$dev/"
-        mv "$out/lib/${name}/include" "$dev/include"
-        rmdir "$out/lib/${name}"
-    '';
+    mkdir -p "$dev/"
+    mv "$out/lib/${name}/include" "$dev/include"
+    rmdir "$out/lib/${name}"
+  '';
 
   meta = {
     description = "A foreign function call interface library";
-
     longDescription = ''
       The libffi library provides a portable, high level programming
       interface to various calling conventions.  This allows a
@@ -51,14 +48,10 @@ stdenv.mkDerivation rec {
       interface.  A layer must exist above libffi that handles type
       conversions for values passed between the two languages.
     '';
-
     homepage = http://sourceware.org/libffi/;
-
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
-    license = "free, non-copyleft";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    license = stdenv.lib.licenses.free;
+    maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
 }
-