guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/05: gnu: udisks: Find the 'mount' command.


From: Ludovic Courtès
Subject: 02/05: gnu: udisks: Find the 'mount' command.
Date: Sun, 01 Nov 2015 16:57:28 +0000

civodul pushed a commit to branch master
in repository guix.

commit 5905114a10572e1858b653bc3fbf21e581344c75
Author: Ludovic Courtès <address@hidden>
Date:   Sun Nov 1 17:43:50 2015 +0100

    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 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index ee94db4..b428041 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]