GNU bug report logs - #60868
[PATCH] build: pyproject-build-system: Use wrap-script instead of wrap-program.

Previous Next

Full log

Message #16 received at 60868 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: jgart <jgart <at> dismail.de>, 60868 <at> debbugs.gnu.org,
 Lars-Dominik Braun <lars <at> 6xq.net>
Subject: Re: [PATCH v2] build: pyproject-build-system: Use wrap-script
 instead of wrap-program.
Date: Tue, 24 Jan 2023 09:42:35 +0100

Hello!

Maxim Cournoyer <maxim.cournoyer <at> gmail.com> skribis:

> * guix/build-system/pyproject.scm (default-guile): New procedure.
> (lower) Add guile to the host-inputs of the bag.
> * guix/build/pyproject-build-system.scm (wrap): Replace wrap-program with
> wrap-script.  Rename bash-related nested variables/procedure with
> guile-related ones.

I had overlooked this patch before, sorry about that.

> +    (host-inputs (modify-inputs inputs
> +                   (append (default-guile))))

Maybe add a comment stating it’s for ‘wrap-script’.

> +  (define bindirs
> +    (append-map (match-lambda
> +                  ((_ . dir)
> +                   (list (string-append dir "/bin")
> +                         (string-append dir "/sbin"))))
> +                outputs))

Should it include “libexec”?

> +  ;; Do not require "guile" to be present in the package inputs
> +  ;; even when there is nothing to wrap.
> +  ;; Also, calculate (guile) only once to prevent some I/O.
> +  (define %guile (delay (search-input-file inputs "bin/guile")))
> +  (define (guile) (force %guile))

Aaah, got it.  :-)

LGTM, thanks!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.