guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#49828] [PATCH 05/20] build-system: minetest: Don't retain reference


From: Leo Prikler
Subject: [bug#49828] [PATCH 05/20] build-system: minetest: Don't retain references to "bash-minimal".
Date: Tue, 03 Aug 2021 11:17:39 +0200
User-agent: Evolution 3.34.2

Hi,

I'd merge this and 04/20 into a single patch.  04/20 does of its own
give a good incentive as to why a new build system is to be used (this
could instead be handled by the importer), with this phase added it
makes slightly more sense.

OTOH, perhaps we shouldn't install those shell scripts in the first
place?  Perhaps we can instead make the importer generate packages
based directly on copy-build-system, in which those static strings are
already evaluated.  WDYT?

Am Montag, den 02.08.2021, 17:50 +0200 schrieb Maxime Devos:
> * guix/build-system/minetest.scm
>   (%standard-phases): New variable.  Delete "patch-source-shebangs"
>   phase.
>   (lower-mod): Set #:phases to value of new variable.
> ---
>  guix/build-system/minetest.scm | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/guix/build-system/minetest.scm b/guix/build-
> system/minetest.scm
> index 29866ced6d..993c5631eb 100644
> --- a/guix/build-system/minetest.scm
> +++ b/guix/build-system/minetest.scm
> @@ -35,6 +35,14 @@
>        (substring package-name 9)
>        package-name))
>  
> +(define %standard-phases
> +  ;; The source code sometimes contains shell scripts which are used
> for
> +  ;; development but not at run time (e.g. listnodes.sh in
> +  ;; minetest-homedecor-modpack).  Don't make them retain a
> reference
> +  ;; to bash-minimal.
> +  '(modify-phases (@ (guix build copy-build-system) %standard-
> phases)
> +     (delete 'patch-source-shebangs)))
> +
>  (define (lower-mod name . arguments)
>    (define lower (build-system-lower copy-build-system))
>    (apply lower
> @@ -42,6 +50,7 @@
>      #:install-plan
>      `'(("." ,(string-append "share/minetest/mods/"
>                              (guix-name->mod-name name))))
> +    #:phases %standard-phases
>      arguments))
>  
>  (define minetest-mod-build-system






reply via email to

[Prev in Thread] Current Thread [Next in Thread]