diff options
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 9c4905bd5293..e0fc88d995b5 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap -, lvm2, e2fsprogs, python +, lvm2, e2fsprogs, python, sqlite }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.5"; + name = "nfs-utils-1.3.2"; src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; + sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v"; }; buildInputs = [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap - lvm2 e2fsprogs python + lvm2 e2fsprogs python sqlite ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. @@ -23,24 +23,21 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen"; - patchPhase = - '' - for i in "tests/"*.sh - do - sed -i "$i" -e's|/bin/bash|/bin/sh|g' - chmod +x "$i" - done - sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c - - # https://bugzilla.redhat.com/show_bug.cgi?id=749195 - sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c - ''; + patches = [ ./no-install.patch ]; - preBuild = - '' - makeFlags="sbindir=$out/sbin" - installFlags="statedir=$TMPDIR" # hack to make `make install' work - ''; + postPatch = '' + for i in "tests/"*.sh + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + chmod +x "$i" + done + sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c + ''; + + preBuild = '' + makeFlags="sbindir=$out/sbin" + installFlags="statedir=$TMPDIR" # hack to make `make install' work + ''; # One test fails on mips. doCheck = !stdenv.isMips; @@ -58,6 +55,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } |