[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/12: gnu: entr: Fix references to external programs.
From: |
guix-commits |
Subject: |
08/12: gnu: entr: Fix references to external programs. |
Date: |
Sat, 11 Jan 2020 18:22:40 -0500 (EST) |
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
- branch master updated (6b9839e -> f9e0488), guix-commits, 2020/01/11
- 02/12: gnu: Use the two-element 'define-deprecated' form where applicable., guix-commits, 2020/01/11
- 03/12: gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch"., guix-commits, 2020/01/11
- 05/12: daemon: Account for deleted store files when deduplication is on., guix-commits, 2020/01/11
- 08/12: gnu: entr: Fix references to external programs.,
guix-commits <=
- 12/12: doc: Make sure 'htmlxref.cnf' is honored., guix-commits, 2020/01/11
- 01/12: deprecation: Add a two-element form for simple aliases., guix-commits, 2020/01/11
- 07/12: system: Drop net-tools from %BASE-PACKAGES (replaced by iproute2)., guix-commits, 2020/01/11
- 06/12: daemon: Fix the displayed GC estimated progress., guix-commits, 2020/01/11
- 09/12: gnu: timidity++: Add libvorbis as input, guix-commits, 2020/01/11
- 11/12: doc: Update htmlxref.cnf., guix-commits, 2020/01/11
- 04/12: gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'., guix-commits, 2020/01/11
- 10/12: gnu: Add libolm., guix-commits, 2020/01/11