summaryrefslogtreecommitdiffstats
path: root/pkgs/os-specific/linux/nfs-utils/default.nix
diff options
context:
space:
mode:
authorLuca Bruno <lethalman88@gmail.com>2015-02-16 13:51:21 +0100
committerLuca Bruno <lethalman88@gmail.com>2015-02-16 13:59:34 +0100
commit8b666652a510f9a2217536e620c23fbd3436edca (patch)
tree22f0b29833d94fab15f56e87379b7331e7786bb5 /pkgs/os-specific/linux/nfs-utils/default.nix
parent9128cf6944c00717231a42055b3c6d0d33c94bd5 (diff)
Revert "nfs-utils: Build and update for 1.3.2"
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils/default.nix')
-rw-r--r--pkgs/os-specific/linux/nfs-utils/default.nix37
1 files changed, 20 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index e0fc88d995b5..166642272454 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "nfs-utils-1.3.2";
+ name = "nfs-utils-1.3.1";
src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2";
- sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
+ sha256 = "1lxfjl6mzdfn7kw2hcn40q9xn40a539iv7spzqbj1sfkvzxlm33l";
};
buildInputs =
@@ -23,21 +23,24 @@ stdenv.mkDerivation rec {
]
++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen";
- patches = [ ./no-install.patch ];
-
- 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
- '';
+ 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
+ '';
+
+ preBuild =
+ ''
+ makeFlags="sbindir=$out/sbin"
+ installFlags="statedir=$TMPDIR" # hack to make `make install' work
+ '';
# One test fails on mips.
doCheck = !stdenv.isMips;