nfs-utils: simplify code using placeholders
This commit is contained in:
parent
e0ca51c367
commit
037d27ed00
|
@ -38,11 +38,9 @@ in stdenv.mkDerivation rec {
|
|||
[ "--enable-gss"
|
||||
"--with-statedir=/var/lib/nfs"
|
||||
"--with-krb5=${kerberosEnv}"
|
||||
"--with-systemd=$(out)/etc/systemd/system"
|
||||
"--with-systemd=${placeholder "out"}/etc/systemd/system"
|
||||
"--enable-libmount-mount"
|
||||
# need an absolute path to lib output here.
|
||||
# TODO: use ${placeholder lib} when nix 1.1 is no longer supported
|
||||
"--with-pluginpath=@lib@/lib/libnfsidmap" # this installs libnfsidmap
|
||||
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
|
||||
]
|
||||
++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
|
||||
|
||||
|
@ -75,11 +73,6 @@ in stdenv.mkDerivation rec {
|
|||
sed '1i#include <stdint.h>' -i support/nsm/rpc.c
|
||||
'';
|
||||
|
||||
# TODO: remove when placeholders are allowed (see configureFlags)
|
||||
postConfigure = ''
|
||||
substituteInPlace support/include/config.h --replace '@lib@' "$lib"
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"sbindir=$(out)/bin"
|
||||
"generator_dir=$(out)/etc/systemd/system-generators"
|
||||
|
|
Loading…
Reference in a new issue