08/12: gnu: entr: Fix references to external programs.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 489703898380ab1a0db86f82c4861a33bf97b5fd
Author: Jakub Kądziołka <address@hidden>
AuthorDate: Sat Jan 11 19:11:44 2020 +0100

    gnu: entr: Fix references to external programs.
    
    * gnu/packages/entr.scm (entr)[arguments](remove-fhs-file-names): Use 
'which'
    instead of relying on the runtime PATH.  Patch /bin/sh too.
    [inputs]: Add NCURSES.
    
    Signed-off-by: Ludovic Courtès <address@hidden>
---
 gnu/packages/entr.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/entr.scm b/gnu/packages/entr.scm
index d011145..cacb5ab 100644
--- a/gnu/packages/entr.scm
+++ b/gnu/packages/entr.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2020 Jakub Kądziołka <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,6 +21,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages entr)
+  #:use-module (gnu packages ncurses)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
@@ -52,11 +54,13 @@
                (invoke "./configure"))))
          (add-before 'build 'remove-fhs-file-names
            (lambda _
-             ;; Use the tools available in $PATH.
              (substitute* "entr.c"
-               (("/bin/cat") "cat")
-               (("/usr/bin/clear") "clear"))
+               (("/bin/sh") (which "sh"))
+               (("/bin/cat") (which "cat"))
+               (("/usr/bin/clear") (which "clear")))
              #t)))))
+    ;; ncurses provides the `clear' binary
+    (inputs `(("ncurses" ,ncurses)))
     (home-page "http://entrproject.org/";)
     (synopsis "Run arbitrary commands when files change")
     (description