branch master updated: gnu: nfs-utils: Fix location of external util-linux binaries.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

nckx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 6409843  gnu: nfs-utils: Fix location of external util-linux binaries.
6409843 is described below

commit 64098437081d8752d95ca9d065bf8367bd5ffb08
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Thu Dec 10 16:59:06 2020 +0100

    gnu: nfs-utils: Fix location of external util-linux binaries.
    
    Fixes:
    
      ~ λ sudo mount -t nfs 1.2.3.4:/ /mnt
      /gnu/store/aaa-nfs-utils-2.4.3/sbin/start-statd: line 10:
      /gnu/store/bbb-util-linux-2.35.1-lib/bin/flock: No such file or directory
      mount.nfs: rpc.statd is not running but is required for remote locking.
    
    * gnu/packages/nfs.scm (nfs-utils)[inputs]: Point the util-linux label at
    util-linux:out and add util-linux:lib as a separate input.
---
 gnu/packages/nfs.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index ba50ca5..8370107 100644
--- a/gnu/packages/nfs.scm
+++ b/gnu/packages/nfs.scm
@@ -117,10 +117,11 @@
      `(("keyutils" ,keyutils)
        ("libevent" ,libevent)
        ("libnfsidmap" ,libnfsidmap)
-       ("rpcsvc-proto" ,rpcsvc-proto) ;for 'rpcgen'
+       ("rpcsvc-proto" ,rpcsvc-proto)   ;for 'rpcgen'
        ("sqlite" ,sqlite)
        ("lvm2" ,lvm2)
-       ("util-linux" ,util-linux "lib")
+       ("util-linux" ,util-linux)           ; only for above substitutions
+       ("util-linux:lib" ,util-linux "lib") ; for libblkid
        ("mit-krb5" ,mit-krb5)
        ("libtirpc" ,libtirpc)
        ("python-wrapper" ,python-wrapper))) ;for the Python based tools