From 489703898380ab1a0db86f82c4861a33bf97b5fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sat, 11 Jan 2020 19:11:44 +0100 Subject: gnu: entr: Fix references to external programs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- 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 d0111452df..cacb5ab7f5 100644 --- a/gnu/packages/entr.scm +++ b/gnu/packages/entr.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Ludovic Courtès ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ ;;; along with GNU Guix. If not, see . (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 -- cgit v1.2.3