b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nfs-utils: Build and update for 1.3.2

Browse source
This commit is contained in:
William A. Kennington III 2015-02-08 14:56:35 -08:00
parent bde3fe2335
commit a4ef29c499
2 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/os-specific/linux/nfs-utils/default.nix
View file

@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "nfs-utils-1.3.1";
name = "nfs-utils-1.3.2";
src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2";
sha256 = "1lxfjl6mzdfn7kw2hcn40q9xn40a539iv7spzqbj1sfkvzxlm33l";
sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
};
buildInputs =
@ -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
patches = [ ./no-install.patch ];
# https://bugzilla.redhat.com/show_bug.cgi?id=749195
sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c
'';
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
'';
preBuild = ''
makeFlags="sbindir=$out/sbin"
installFlags="statedir=$TMPDIR" # hack to make `make install' work
'';
# One test fails on mips.
doCheck = !stdenv.isMips;

19
pkgs/os-specific/linux/nfs-utils/no-install.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/Makefile.in b/Makefile.in
index 6a5c7c2..64342fe 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -872,14 +872,6 @@ uninstall-am:
install-data-hook:
- if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi
- touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
- touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
- touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
- mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
- touch $(DESTDIR)$(statdpath)/state
- chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
- -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
uninstall-hook:
rm $(DESTDIR)$(statedir)/xtab