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/tools/networking/ppp/default.nix

@@ -1,38 +1,31 @@
 { stdenv, fetchurl, substituteAll, libpcap }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.5";
+  version = "2.4.7";
   name = "ppp-${version}";
 
   src = fetchurl {
-    url = "${meta.homepage}ftp/ppp/${name}.tar.gz";
-    sha256 = "019m00q85nrgdpjlhb9021a3iw3pr4a0913gp4h9k7r9r7z7lca3";
+    url = "mirror://samba/ppp/${name}.tar.gz";
+    sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
   };
 
   patches =
     [ ( substituteAll {
         src = ./nix-purity.patch;
         inherit libpcap;
-        glibc = stdenv.gcc.libc.dev;
+        glibc = stdenv.cc.libc.dev;
       })
+      # Without nonpriv.patch, pppd --version doesn't work when not run as
+      # root.
       ./nonpriv.patch
     ];
 
-  postPatch = ''
-    # enable ipv6
-    substituteInPlace pppd/Makefile.linux \
-      --replace "#HAVE_INET6=y" "HAVE_INET6=y"
-    rm -v include/linux/if_pppol2tp.h
-  '';
-
   buildInputs = [ libpcap ];
 
-  postInstall = "chmod -v -R +rw $out";
-
   meta = {
-    homepage = http://ppp.samba.org/;
+    homepage = https://ppp.samba.org/;
     description = "Point-to-point implementation for Linux and Solaris";
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ stdenv.lib.maintainers.falsifian ];
   };
 }