From 2d1d2dd8044fb640627ed19cb99b91a3909e3c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 19 Mar 2015 23:15:33 +0100
Subject: [PATCH] services: guix-service: Add 'lsof' and 'lsh' to guix-daemon's
 $PATH.

* gnu/services/base.scm (guix-service): Add #:lsof and #:lsh parameters.
  [start]: Pass #:environment-variables to 'make-forkexec-constructor'.
---
 gnu/services/base.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 84bac94d9f..a9126032bb 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -28,6 +28,8 @@ (define-module (gnu services base)
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
+  #:use-module (gnu packages lsh)
+  #:use-module (gnu packages lsof)
   #:use-module ((gnu build file-systems)
                 #:select (mount-flags->bit-mask))
   #:use-module (guix gexp)
@@ -612,7 +614,8 @@ (define (hydra-key-authorization guix)
 (define* (guix-service #:key (guix guix) (builder-group "guixbuild")
                        (build-accounts 10) (authorize-hydra-key? #t)
                        (use-substitutes? #t)
-                       (extra-options '()))
+                       (extra-options '())
+                       (lsof lsof) (lsh lsh))
   "Return a service that runs the build daemon from @var{guix}, and has
 @var{build-accounts} user accounts available under @var{builder-group}.
 
@@ -646,7 +649,13 @@ (define activate
                        #$@(if use-substitutes?
                               '()
                               '("--no-substitutes"))
-                       #$@extra-options)))
+                       #$@extra-options)
+
+                 ;; Add 'lsof' (for the GC) and 'lsh' (for offloading) to the
+                 ;; daemon's $PATH.
+                 #:environment-variables
+                 (list (string-append "PATH=" #$lsof "/bin:"
+                                      #$lsh "/bin"))))
              (stop #~(make-kill-destructor))
              (user-accounts (guix-build-accounts build-accounts
                                                  #:group builder-group))