setcap-wrapper: Merging with upstream master and resolving conflicts

pkgs/os-specific/linux/fuse/default.nix

@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, utillinux }:
+{ stdenv, fetchFromGitHub, utillinux
+, autoconf, automake, libtool, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "fuse-2.9.5";
+  name = "fuse-${version}";
+  version = "2.9.7";
 
-  #builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz";
-    sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp";
+  src = fetchFromGitHub {
+    owner = "libfuse";
+    repo = "libfuse";
+    rev = name;
+    sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
   };
 
-  buildInputs = [ utillinux ];
-
-  inherit utillinux;
+  buildInputs = [ utillinux autoconf automake libtool gettext ];
 
   preConfigure =
     ''
@@ -26,12 +26,15 @@ stdenv.mkDerivation rec {
       export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/permissions-wrappers\""
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
+      sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
+
+      ./makeconf.sh
     '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://fuse.sourceforge.net/;
+    homepage = https://github.com/libfuse/libfuse;
     description = "Kernel module and library that allows filesystems to be implemented in user space";
     platforms = platforms.linux;
     maintainers = [ maintainers.mornfall ];