Re: [core-updates] Native build of make-boot0 fails on missing zstd

[Janneke Nieuwenhuizen]

Maxim Cournoyer writes:

Hi Maxim,

> Janneke Nieuwenhuizen <janneke@gnu.org> writes:
>
>> Maxim Cournoyer writes:
>>
>> Hi,
>>
>>> Efraim Flashner <efraim@flashner.co.il> writes:
>>>
>>>> On Sun, Jan 21, 2024 at 10:33:37AM +0100, Janneke Nieuwenhuizen wrote:

> My previous diff included yet another bug... here's one that seems to
> work fine:
>
> modified   guix/packages.scm
> @@ -949,10 +949,7 @@ (define* (patch-and-repack source patches
>           (bzip2   (lookup-input "bzip2"))
>           (lzip    (lookup-input "lzip"))
>           (xz      (lookup-input "xz"))
> -         (zstd    (or (lookup-input "zstd")
> -                      ;; Fallback to xz in case zstd is not available, such 
> as
> -                      ;; for bootstrap packages.
> -                      xz))
> +         (zstd    (lookup-input "zstd"))
>           (patch   (lookup-input "patch"))
>           (comp    (and=> (compressor source-file-name) lookup-input))
>           (patches (map instantiate-patch patches)))
> @@ -1033,10 +1030,13 @@ (define* (patch-and-repack source patches
>                            locale (system-error-errno args)))))
>  
>              (setenv "PATH"
> -                    (string-append #+zstd "/bin"
> -                                   (if #+comp
> -                                       (string-append ":" #+comp "/bin")
> -                                       "")))
> +                    (string-join
> +                     (map (cut string-append <> "/bin")
> +                          ;; Fallback to xz in case zstd is not
> +                          ;; available, such as for bootstrap packages.
> +                          (delete-duplicates
> +                           (filter-map identity (list #+zstd #+xz #+comp))))
> +                     ":"))
>
> I'll push this to core-updates along a list of cherry-picked changes
> from our tracker destined for core-updates, if it tests good on your
> side.

As mentioned on IRC, this fixes it for me; thanks!

Greetings,
Janneke

-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com