From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 11 13:11:58 2020 Received: (at submit) by debbugs.gnu.org; 11 Jan 2020 18:11:58 +0000 Received: from localhost ([127.0.0.1]:56653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqLEn-0006IM-NW for submit@debbugs.gnu.org; Sat, 11 Jan 2020 13:11:58 -0500 Received: from lists.gnu.org ([209.51.188.17]:41426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqLEm-0006IE-JL for submit@debbugs.gnu.org; Sat, 11 Jan 2020 13:11:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45667) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iqLEl-00065b-6n for guix-patches@gnu.org; Sat, 11 Jan 2020 13:11:52 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iqLEj-0001dz-RV for guix-patches@gnu.org; Sat, 11 Jan 2020 13:11:51 -0500 Received: from pat.zlotemysli.pl ([37.59.186.212]:52764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iqLEj-0001ah-I7 for guix-patches@gnu.org; Sat, 11 Jan 2020 13:11:49 -0500 Received: (qmail 24916 invoked by uid 1009); 11 Jan 2020 19:11:47 +0100 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25690. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.019644 secs); 11 Jan 2020 18:11:47 -0000 Received: from unknown (HELO zdrowyportier.kadziolka.net) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with SMTP; 11 Jan 2020 19:11:47 +0100 Date: Sat, 11 Jan 2020 19:11:44 +0100 From: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= To: guix-patches@gnu.org Subject: [PATCH] gnu: entr: Fix references to external programs Message-ID: <20200111181144.lex3bc4acnpze5d4@zdrowyportier.kadziolka.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 37.59.186.212 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/entr.scm (entr)[remove-fhs-file-names]: Use (which) instead of relying on the runtime PATH. Patch the path for /bin/sh too. * gnu/packages/entr.scm (entr)[inputs]: Add a dependency on ncurses to get the path of the clear binary it provides. --- 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..3b006e2d85 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 -- 2.24.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 11 16:34:49 2020 Received: (at 39091-done) by debbugs.gnu.org; 11 Jan 2020 21:34:49 +0000 Received: from localhost ([127.0.0.1]:56800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqOPB-0005JC-97 for submit@debbugs.gnu.org; Sat, 11 Jan 2020 16:34:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iqOP9-0005Ix-Jm for 39091-done@debbugs.gnu.org; Sat, 11 Jan 2020 16:34:47 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:54110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iqOP4-0000Mh-3t; Sat, 11 Jan 2020 16:34:42 -0500 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46394 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iqOP3-00030e-HE; Sat, 11 Jan 2020 16:34:41 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jakub =?utf-8?B?S8SFZHppb8WCa2E=?= Subject: Re: [bug#39091] [PATCH] gnu: entr: Fix references to external programs References: <20200111181144.lex3bc4acnpze5d4@zdrowyportier.kadziolka.net> Date: Sat, 11 Jan 2020 22:34:39 +0100 In-Reply-To: <20200111181144.lex3bc4acnpze5d4@zdrowyportier.kadziolka.net> ("Jakub \=\?utf-8\?B\?S8SFZHppb8WCa2EiJ3M\=\?\= message of "Sat, 11 Jan 2020 19:11:44 +0100") Message-ID: <87o8v9u174.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 39091-done Cc: 39091-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Jakub K=C4=85dzio=C5=82ka skribis: > * gnu/packages/entr.scm (entr)[remove-fhs-file-names]: Use (which) > instead of relying on the runtime PATH. Patch the path for /bin/sh > too. > * gnu/packages/entr.scm (entr)[inputs]: Add a dependency on ncurses to > get the path of the clear binary it provides. Committed with tweaks to the commit log. Thanks, Ludo=E2=80=99. From unknown Tue Aug 19 06:31:10 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 09 Feb 2020 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator