public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autofs5: 5.1.1 -> 5.1.2

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-08-14 22:32:08 +03:00
parent bda3423b3a
commit 3e84cbc4ca
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/os-specific/linux/autofs/default.nix
View File

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