guix-commits
[Top][All Lists]
Advanced

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

02/42: guix: node-build-system: Add implicit libuv input.


From: guix-commits
Subject: 02/42: guix: node-build-system: Add implicit libuv input.
Date: Sat, 8 Jan 2022 20:09:20 -0500 (EST)

lilyp pushed a commit to branch master
in repository guix.

commit 75416be16bf8df97ca31de6aa0a8b8cc731aec78
Author: Philip McGrath <philip@philipmcgrath.com>
AuthorDate: Sat Jan 8 03:41:50 2022 -0500

    guix: node-build-system: Add implicit libuv input.
    
    * 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.
    
    Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 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 735f8dd06e..24bd677bfc 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.
 ;;;
@@ -61,10 +63,15 @@
                               `(("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)



reply via email to

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