diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-11 20:57:29 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-08-11 20:57:29 +0000 |
| commit | 6f70fd1c6b4bae39585e688beefeef46d253b372 (patch) | |
| tree | ca01ffcafa5a875e27a8bc85f9ab96e1a4038453 /pkgs/os-specific/linux/nfs-utils | |
| parent | c2737e315aff6bc1318bc255353453922979ad74 (diff) | |
| download | nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar.gz nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar.bz2 nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar.lz nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar.xz nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.tar.zst nixpkgs-6f70fd1c6b4bae39585e688beefeef46d253b372.zip | |
* util-linux-ng: updated to 2.16. Don't build a separate mount
anymore since the build process was very hacky. Instead mount/umount looks for mount helpers in /var/run/current-system/sw/sbin. It would be better to use an environment variable, but that would be risky if mount is setuid root. * e2fsprogs: updated to 1.41.8. Don't build libuuid, libblkid etc. anymore, since they have been moved to util-linux-ng. * nfs-utils: updated to 1.2.0. svn path=/nixpkgs/trunk/; revision=16682
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/sbindir.patch | 11 |
2 files changed, 13 insertions, 22 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 7efdb07687f..90b9068eacc 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,22 +1,24 @@ -{ fetchurl, stdenv, tcpWrapper, e2fsprogs }: +{ fetchurl, stdenv, tcpWrapper, libuuid }: stdenv.mkDerivation rec { - name = "nfs-utils-1.1.2"; + name = "nfs-utils-1.2.0"; src = fetchurl { - url = "mirror://sourceforge/nfs/${name}.tar.gz"; - sha256 = "0cs0kl18f4h8nkbnd7n3flw9krhkm3mx9sh7vz9dkvp46g0v228x"; + url = "mirror://sourceforge/nfs/${name}.tar.bz2"; + sha256 = "1ld1f6wcm53pza3zy768y1y8xa01zq3bnjyy1j3z62yd7a5lcffb"; }; - patches = [ ./sbindir.patch ]; - - # Needs `libblkid' and `libcomerr' from `e2fsprogs'. - buildInputs = [ tcpWrapper e2fsprogs ]; + # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. + buildInputs = [ tcpWrapper libuuid ]; # FIXME: Currently too lazy to build the dependencies needed for NFSv4. - configurePhase = ''./configure --prefix=$out \ - --disable-gss --disable-nfsv4 \ - --with-statedir=$out/var/lib/nfs''; + configureFlags = "--disable-gss --disable-nfsv4 --with-statedir=/var/lib/nfs"; + + preBuild = + '' + makeFlags="sbindir=$out/sbin" + installFlags="statedir=$TMPDIR" # hack to make `make install' work + ''; meta = { description = "Linux user-space NFS utilities"; diff --git a/pkgs/os-specific/linux/nfs-utils/sbindir.patch b/pkgs/os-specific/linux/nfs-utils/sbindir.patch deleted file mode 100644 index 2884b56e6d1..00000000000 --- a/pkgs/os-specific/linux/nfs-utils/sbindir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nfs-utils-1.1.2/utils/mount/Makefile.in 2008-03-14 18:44:42.000000000 +0100 -+++ nfs-utils-1.1.2/utils/mount/Makefile.in 2008-03-30 19:30:57.000000000 +0200 -@@ -219,7 +219,7 @@ psdir = @psdir@ - - # These binaries go in /sbin (not /usr/sbin), and that cannot be - # overriden at config time. --sbindir = /sbin -+sbindir = @prefix@/sbin - secure_statd = @secure_statd@ - sharedstatedir = @sharedstatedir@ - srcdir = @srcdir@ |