guix-patches
[Top][All Lists]
Advanced

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

[bug#51838] [PATCH v5 20/45] guix: node-build-system: Add implicit libuv


From: Liliana Marie Prikler
Subject: [bug#51838] [PATCH v5 20/45] guix: node-build-system: Add implicit libuv input.
Date: Fri, 17 Dec 2021 06:08:33 +0100
User-agent: Evolution 3.42.1

Am Donnerstag, dem 16.12.2021 um 21:03 -0500 schrieb Philip McGrath:
> * guix/build-system/node.scm (lower): Add the version of libuv
> used as an input to the #:node package as an additional implicit
> input, so that packages needing libuv always get the correct version.
> ---
>  guix/build-system/node.scm | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm
> index 330d10dca5..47af4bb9e2 100644
> --- a/guix/build-system/node.scm
> +++ b/guix/build-system/node.scm
> @@ -2,6 +2,8 @@
>  ;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
>  ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
>  ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
> +;;; Copyright © 2021 Philip McGrath <philip@philipmcgrath.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -62,10 +64,15 @@ (define private-keywords
>                                `(("source" ,source))
>                                '())
>                          ,@inputs
> -
>                          ;; Keep the standard inputs of 'gnu-build-
> system'.
>                          ,@(standard-packages)))
>           (build-inputs `(("node" ,node)
> +                         ;; Many packages with native addons need
> +                         ;; libuv headers. The libuv version must
> +                         ;; be exactly the same as for the node
> +                         ;; package we are adding implicitly,
> +                         ;; so we take care of adding libuv, too.
> +                         ("libuv" ,@(assoc-ref (package-inputs node)
> "libuv"))
>                           ,@native-inputs))
>           (outputs outputs)
>           (build node-build)
Do this and #21 have to be separated so far from the rest?  If not, I'd
do build system first, then new packages.  Otherwise fair enough.





reply via email to

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