nfs-utils: Build and update for 1.3.2

+34 -18
+15 -18
pkgs/os-specific/linux/nfs-utils/default.nix
··· 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 - name = "nfs-utils-1.3.1"; 6 + name = "nfs-utils-1.3.2"; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://sourceforge/nfs/${name}.tar.bz2"; 10 - sha256 = "1lxfjl6mzdfn7kw2hcn40q9xn40a539iv7spzqbj1sfkvzxlm33l"; 10 + sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v"; 11 11 }; 12 12 13 13 buildInputs = ··· 23 23 ] 24 24 ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen"; 25 25 26 - patchPhase = 27 - '' 28 - for i in "tests/"*.sh 29 - do 30 - sed -i "$i" -e's|/bin/bash|/bin/sh|g' 31 - chmod +x "$i" 32 - done 33 - sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c 26 + patches = [ ./no-install.patch ]; 34 27 35 - # https://bugzilla.redhat.com/show_bug.cgi?id=749195 36 - sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c 37 - ''; 28 + postPatch = '' 29 + for i in "tests/"*.sh 30 + do 31 + sed -i "$i" -e's|/bin/bash|/bin/sh|g' 32 + chmod +x "$i" 33 + done 34 + sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c 35 + ''; 38 36 39 - preBuild = 40 - '' 41 - makeFlags="sbindir=$out/sbin" 42 - installFlags="statedir=$TMPDIR" # hack to make `make install' work 43 - ''; 37 + preBuild = '' 38 + makeFlags="sbindir=$out/sbin" 39 + installFlags="statedir=$TMPDIR" # hack to make `make install' work 40 + ''; 44 41 45 42 # One test fails on mips. 46 43 doCheck = !stdenv.isMips;
+19
pkgs/os-specific/linux/nfs-utils/no-install.patch
··· 1 + diff --git a/Makefile.in b/Makefile.in 2 + index 6a5c7c2..64342fe 100644 3 + --- a/Makefile.in 4 + +++ b/Makefile.in 5 + @@ -872,14 +872,6 @@ uninstall-am: 6 + 7 + 8 + install-data-hook: 9 + - if [ ! -d $(DESTDIR)$(statedir) ]; then mkdir -p $(DESTDIR)$(statedir); fi 10 + - touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab 11 + - touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab 12 + - touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab 13 + - mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak 14 + - touch $(DESTDIR)$(statdpath)/state 15 + - chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state 16 + - -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state 17 + 18 + uninstall-hook: 19 + rm $(DESTDIR)$(statedir)/xtab