Merge commit staging+systemd into closure-size

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

pkgs/tools/filesystems/xfsprogs/default.nix

@@ -1,28 +1,27 @@
 { stdenv, fetchurl, gettext, libuuid, readline }:
 
 stdenv.mkDerivation rec {
-  name = "xfsprogs-3.2.2";
+  name = "xfsprogs-4.2.0";
 
   src = fetchurl {
     urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz")
       [ "cmd_tars" "previous" ];
-    sha256 = "1aszsqz7gkqdagads18ybslbfkyxq893rykmsz9lm7f33pi5qlhs";
+    sha256 = "0q2j1rrh37kqyihaq5lc31xdi36lgg9asidaad0fada61ynv3six";
   };
 
   prePatch = ''
-    sed -i s,/bin/bash,`type -P bash`,g install-sh
-    sed -i s,ldconfig,`type -P ldconfig`,g configure m4/libtool.m4
+    sed -i "s,/bin/bash,$(type -P bash),g" install-sh
+    sed -i "s,ldconfig,$(type -P ldconfig),g" configure m4/libtool.m4
 
     # Fixes from gentoo 3.2.1 ebuild
     sed -i "/^PKG_DOC_DIR/s:@pkg_name@:${name}:" include/builddefs.in
-    sed -i '1iLLDFLAGS = -static' {estimate,fsr}/Makefile
-    sed -i "/LLDFLAGS/s:-static::" $(find -name Makefile)
+    sed -i "/LLDFLAGS.*libtool-libs/d" $(find -name Makefile)
     sed -i '/LIB_SUBDIRS/s:libdisk::' Makefile
   '';
 
   patches = [
-    # This patch fixes shared libs installation, still not fixed in 3.2.2
-    ./xfsprogs-3.2.2-sharedlibs.patch
+    # This patch fixes shared libs installation, still not fixed in 4.2.0
+    ./4.2.0-sharedlibs.patch
   ];
 
   buildInputs = [ gettext libuuid readline ];