From b2d61a850d98b040ded3d28d0405398e46c81811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 20 Mar 2012 23:17:45 +0000 Subject: [PATCH] Enabling nfsv4 and nfsv41 in nfsUtils (or at least I think so). svn path=/nixpkgs/trunk/; revision=33315 --- .../libraries/libnfsidmap/default.nix | 16 ++++++++++++++++ pkgs/development/libraries/ti-rpc/default.nix | 3 +++ pkgs/os-specific/linux/nfs-utils/default.nix | 10 ++++++---- pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/libnfsidmap/default.nix diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix new file mode 100644 index 00000000000..1b623c4d490 --- /dev/null +++ b/pkgs/development/libraries/libnfsidmap/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libnfsidmap-0.25"; + + src = fetchurl { + url = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz"; + sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5"; + }; + + meta = { + homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; + description = "Library for holding mulitiple methods of mapping names to id's and visa versa, mainly for NFSv4"; + license = "BSD"; + }; +} diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index ae52ca3959d..e26d714367f 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -8,7 +8,10 @@ stdenv.mkDerivation rec { sha256 = "f05eb17c85d62423858b8f74512cfe66a9ae1cedf93f03c2a0a32e04f0a33705"; }; + # http://www.sourcemage.org/projects/grimoire/repository/revisions/d6344b6a3a94b88ed67925a474de5930803acfbf preConfigure = '' + echo "" > src/des_crypt.c + sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "doc/Makefile.in" ''; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 2d89d70e64a..dfbc1b56209 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,4 +1,5 @@ -{ fetchurl, stdenv, tcpWrapper, utillinux, libcap }: +{ fetchurl, stdenv, tcpWrapper, utillinux, libcap, libtirpc, libevent, libnfsidmap, lvm2, + e2fsprogs }: stdenv.mkDerivation rec { name = "nfs-utils-1.2.5"; @@ -8,13 +9,14 @@ stdenv.mkDerivation rec { sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; }; - # Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'. - buildInputs = [ tcpWrapper utillinux libcap ]; + buildInputs = [ tcpWrapper utillinux libcap libtirpc libevent libnfsidmap lvm2 + e2fsprogs ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. configureFlags = - [ "--disable-gss" "--disable-nfsv4" "--disable-nfsv41" "--disable-tirpc" + [ "--disable-gss" "--with-statedir=/var/lib/nfs" + "--with-tirpcinclude=${libtirpc}/include/tirpc" ] ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a487df71ef4..4bd4adb8381 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4035,6 +4035,8 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; + libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; + libnice = callPackage ../development/libraries/libnice { }; libplist = callPackage ../development/libraries/libplist { };