summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-12-10 16:59:06 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-12-10 17:01:31 +0100
commit64098437081d8752d95ca9d065bf8367bd5ffb08 (patch)
treeb592f22ac060af1a3675cd6aeeb775942ad0db82 /gnu/packages
parentd4e3527f78d22d77a62d6e00e179526c37831bc8 (diff)
downloadguix-64098437081d8752d95ca9d065bf8367bd5ffb08.tar.gz
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/nfs.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm
index ba50ca5e01..8370107939 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