autofs5: 5.1.1 -> 5.1.2

1 files changed, 16 insertions, 14 deletions

diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index 6ae9d8d2667..4401eb24cb4 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -1,27 +1,27 @@
-{ stdenv, fetchurl, flex, bison, linuxHeaders }:
+{ stdenv, lib, fetchurl, flex, bison, linuxHeaders, libtirpc, utillinux, nfs-utils, e2fsprogs
+, libxml2 }:
 
 let
-  version = "5.1.1";
+  version = "5.1.2";
   name = "autofs-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
-    sha256 = "1hr1f11wp538h7r298wpa5khfkhfs8va3p1kdixxhrgkkzpz13z0";
+    sha256 = "031z64hmbzyllgvi72cw87755vnmafvsfwi0w21xksla10wxxdw8";
   };
 
   preConfigure = ''
-    configureFlags="--disable-move-mount --with-path=$PATH"
-    export MOUNT=/var/run/current-system/sw/bin/mount
-    export UMOUNT=/var/run/current-system/sw/bin/umount
-    export MODPROBE=/var/run/current-system/sw/bin/modprobe
-    # Grrr, rpcgen can't find cpp. (NIXPKGS-48)
-    mkdir rpcgen
-    echo "#! $shell" > rpcgen/rpcgen
-    echo "exec $(type -tp rpcgen) -Y $(dirname $(type -tp cpp)) \"\$@\"" >> rpcgen/rpcgen
-    chmod +x rpcgen/rpcgen
-    export RPCGEN=$(pwd)/rpcgen/rpcgen
+    configureFlags="--enable-force-shutdown --enable-ignore-busy --with-path=$PATH"
+
+    export MOUNT=${lib.getBin utillinux}/bin/mount
+    export MOUNT_NFS=${lib.getBin nfs-utils}/bin/mount.nfs
+    export UMOUNT=${lib.getBin utillinux}/bin/umount
+    export MODPROBE=${lib.getBin utillinux}/bin/modprobe
+    export E2FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext2
+    export E3FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext3
+    export E4FSCK=${lib.getBin e2fsprogs}/bin/fsck.ext4
   '';
 
   installPhase = ''
@@ -29,7 +29,9 @@ in stdenv.mkDerivation {
     #make install SUBDIRS="samples" # impure!
   '';
 
-  buildInputs = [ flex bison linuxHeaders ];
+  buildInputs = [ linuxHeaders libtirpc libxml2 ];
+
+  nativeBuildInputs = [ flex bison ];
 
   meta = {
     inherit version;