JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfs-utils: Get rid of runtime dependency on kerberos.dev

Browse Source
This commit is contained in:
Eelco Dolstra 2018-10-11 17:40:20 +02:00
parent edff37b83a
commit 8beb1e26e0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/nfs-utils/default.nix
View File

@ -5,14 +5,9 @@
let let
statdPath = lib.makeBinPath [ systemd utillinux coreutils ]; statdPath = lib.makeBinPath [ systemd utillinux coreutils ];
in
# Not nice; feel free to find a nicer solution. stdenv.mkDerivation rec {
kerberosEnv = buildEnv {
name = "kerberos-env-${kerberos.version}";
paths = with lib; [ (getDev kerberos) (getLib kerberos) ];
};
in stdenv.mkDerivation rec {
name = "nfs-utils-${version}"; name = "nfs-utils-${version}";
version = "2.3.3"; version = "2.3.3";
@ -34,10 +29,19 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure =
''
substituteInPlace configure \
--replace '$dir/include/gssapi' ${lib.getDev kerberos}/include/gssapi \
--replace '$dir/bin/krb5-config' ${lib.getDev kerberos}/bin/krb5-config
'';
#configureScript = "bash -x configure";
configureFlags = configureFlags =
[ "--enable-gss" [ "--enable-gss"
"--with-statedir=/var/lib/nfs" "--with-statedir=/var/lib/nfs"
"--with-krb5=${kerberosEnv}" "--with-krb5=${lib.getLib kerberos}"
"--with-systemd=${placeholder "out"}/etc/systemd/system" "--with-systemd=${placeholder "out"}/etc/systemd/system"
"--enable-libmount-mount" "--enable-libmount-mount"
"--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap "--with-pluginpath=${placeholder "lib"}/lib/libnfsidmap" # this installs libnfsidmap
@ -97,6 +101,8 @@ in stdenv.mkDerivation rec {
# One test fails on mips. # One test fails on mips.
doCheck = !stdenv.isMips; doCheck = !stdenv.isMips;
disallowedReferences = [ (lib.getDev kerberos) ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Linux user-space NFS utilities"; description = "Linux user-space NFS utilities";