diff options
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 88a4f33b2f3f0..e3b8bc97e4d7b 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib, pkg-config, util-linux, libcap, libtirpc, libevent , sqlite, libkrb5, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers -, python3, buildPackages, nixosTests, rpcsvc-proto -, enablePython ? true +, python3, buildPackages, nixosTests, rpcsvc-proto, openldap +, enablePython ? true, enableLdap ? true }: let @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "nfs-utils"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { url = "mirror://kernel/linux/utils/nfs-utils/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-UgCHPoHE1hDiRi/CYv4YE18tvni3l5+VrM0VmuZNUBE="; + hash = "sha256-AbOw+5x9C7q/URTHNlQgMHSMeI7C/Zc0dEIB6bChEZ0="; }; # libnfsidmap is built together with nfs-utils from the same source, @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 libuuid keyutils libkrb5 tcp_wrappers - ] ++ lib.optional enablePython python3; + ] ++ lib.optional enablePython python3 + ++ lib.optional enableLdap openldap; enableParallelBuilding = true; @@ -47,7 +48,7 @@ stdenv.mkDerivation rec { "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-rpcgen=${buildPackages.rpcsvc-proto}/bin/rpcgen" "--with-modprobedir=${placeholder "out"}/etc/modprobe.d" - ]; + ] ++ lib.optional enableLdap "--with-ldap"; patches = lib.optionals stdenv.hostPlatform.isMusl [ # http://openwall.com/lists/musl/2015/08/18/10 @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { substituteInPlace systemd/nfs-utils.service \ --replace "/bin/true" "${coreutils}/bin/true" - substituteInPlace tools/nfsrahead/Makefile.in \ + substituteInPlace tools/nfsrahead/Makefile.in systemd/Makefile.in \ --replace "/usr/lib/udev/rules.d/" "$out/lib/udev/rules.d/" substituteInPlace utils/mount/Makefile.in \ |