diff options
| author | Uli Baum <xeji@cat3.de> | 2018-08-30 20:11:40 +0200 |
|---|---|---|
| committer | Uli Baum <xeji@cat3.de> | 2018-08-30 20:11:40 +0200 |
| commit | 037d27ed00435d6962c4eb9275466ccc4d2fbe77 (patch) | |
| tree | afacd9c81f248e200b4c3ae9e9b6bce364ef7b15 /pkgs/os-specific/linux/nfs-utils | |
| parent | e0ca51c36741a4a14ebaf059d488d3cab3128cd9 (diff) | |
| download | nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar.gz nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar.bz2 nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar.lz nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar.xz nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.tar.zst nixpkgs-037d27ed00435d6962c4eb9275466ccc4d2fbe77.zip | |
nfs-utils: simplify code using placeholders
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index fa5fabdb3c4..f67663b3106 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -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" |