diff mbox series

[bug#59188,v7,20/20] gnu: libnode: Use node-lts as base.

Message ID 24ff0c1a9bc614b7d4a9adffcbfbbfc4c34a25d6.1681742871.git.jlicht@fsfe.org
State New
Headers show
Series Updating node-lts to 18.X | expand

Commit Message

Jelle Licht April 17, 2023, 2:51 p.m. UTC 
From: Hilton Chain <hako@ultrarare.space>

* gnu/packages/node.scm (libnode): Use node-lts as base.
* gnu/packages/cran.scm (r-v8)[arguments]<#:phases>: Adjusted accordingly.

---

Changes in v7:
- Build emacs-nodejs-repl with node-lts
- Rebase on master
- Update node-lts to 18.16.0
- Still broken on armhf, but has been for years :/

 gnu/packages/cran.scm | 2 +-
 gnu/packages/node.scm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index 03c92e7ffd..03e0f36cdf 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -1428,7 +1428,7 @@  (define-public r-v8
                (("^PKG_LIBS=.*")
                 (string-append "PKG_LIBS="
                                (assoc-ref inputs "libnode")
-                               "/lib/libnode.so.64\n")))
+                               "/lib/libnode.so.108\n")))
              (setenv "INCLUDE_DIR"
                      (string-append
                       (assoc-ref inputs "libnode")
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 35e1386844..37cfec8a6b 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -905,10 +905,10 @@  (define-public node-lts
            zlib))))
 
 (define-public libnode
-  (package/inherit node
+  (package/inherit node-lts
     (name "libnode")
     (arguments
-     (substitute-keyword-arguments (package-arguments node)
+     (substitute-keyword-arguments (package-arguments node-lts)
        ((#:configure-flags flags ''())
         `(cons* "--shared" "--without-npm" ,flags))
        ((#:phases phases '%standard-phases)