Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

pkgs/tools/misc/findutils/default.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [coreutils];
 
-  patches = [ ./findutils-path.patch ./change_echo_path.patch ];
+  patches = [ ./findutils-path.patch ./change_echo_path.patch ./disable-test-canonicalize.patch ];
 
   outputs = [ "out" "info" ];
 
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
   };
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i gnulib/lib/fpending.h -e '/include <stdio_ext.h>/d'
+  '' else null;
+
   meta = {
     homepage = http://www.gnu.org/software/findutils/;
     description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";