From 5905114a10572e1858b653bc3fbf21e581344c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 1 Nov 2015 17:43:50 +0100 Subject: [PATCH] gnu: udisks: Find the 'mount' command. * gnu/packages/freedesktop.scm (udisks)[inputs]: Add UTIL-LINUX. [arguments]: Add 'set-mount-file-name' phase. --- gnu/packages/freedesktop.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index ee94db440a..b428041423 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -343,7 +343,8 @@ Analysis and Reporting Technology) functionality.") `(("acl" ,acl) ("libatasmart" ,libatasmart) ("libgudev" ,libgudev) - ("polkit" ,polkit))) + ("polkit" ,polkit) + ("util-linux" ,util-linux))) (arguments `(#:tests? #f ; requiring system message dbus #:configure-flags @@ -360,7 +361,18 @@ Analysis and Reporting Technology) functionality.") (("girdir = .*") "girdir = $(datadir)/gir-1.0\n") (("typelibsdir = .*") - "typelibsdir = $(libdir)/girepository-1.0\n"))))))) + "typelibsdir = $(libdir)/girepository-1.0\n")))) + (add-after 'install 'set-mount-file-name + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell 'udisksd' where to find the 'mount' command. + (let ((out (assoc-ref outputs "out")) + (utils (assoc-ref inputs "util-linux"))) + (wrap-program (string-append out "/libexec/udisks2/udisksd") + `("PATH" ":" prefix + (,(string-append utils "/bin") ;for 'mount' + "/run/current-system/profile/bin" + "/run/current-system/profile/sbin"))) + #t)))))) (home-page "http://www.freedesktop.org/wiki/Software/udisks/") (synopsis "Disk manager service") (description