bug#39091: closed ([PATCH] gnu: entr: Fix references to external programs)

[GNU bug Tracking System]

Your message dated Sat, 11 Jan 2020 22:34:39 +0100
with message-id <address@hidden>
and subject line Re: [bug#39091] [PATCH] gnu: entr: Fix references to external 
programs
has caused the debbugs.gnu.org bug report #39091,
regarding [PATCH] gnu: entr: Fix references to external programs
to be marked as done.

(If you believe you have received this mail in error, please contact
address@hidden.)


-- 
39091: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=39091
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: entr: Fix references to external programs
>
>
>
>
> Date: 
>
> Sat, 11 Jan 2020 19:11:44 +0100
>
>
>
>
> * 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 <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
> -- 
> 2.24.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#39091] [PATCH] gnu: entr: Fix references to external programs
>
>
>
>
> Date: 
>
> Sat, 11 Jan 2020 22:34:39 +0100
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux)
>
>
>
>
> Hi,
>
> Jakub Kądziołka <address@hidden> 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’.
>
>
> --- End Message ---