gnu: r-v8: Use node-lts instead of libnode.

* gnu/packages/cran.scm (r-v8)[inputs]: Use node-lts instead of libnode.
[updater-extra-inputs]: Change "libnode" to "node".
[find-v8]: Use 'search-input-file' & 'search-input-directory' to patch
configure flags directly; drop INCLUDE_DIR and LIB_DIR environment variables.

Change-Id: I520f36f94640b88d582a26bb97d39ff42b5e8dc7

1 files changed, 8 insertions, 11 deletions

diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index dcf33d06317..3201eef0fae 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -9592,7 +9592,7 @@ similar rank-based tests for equal probability distributions due to Neuhauser
          "0ax9j6f314rjn3pzdlcvw6vfdqw5aqclid66129gvjxmxq84p5vj"))))
     (properties
      `((upstream-name . "V8")
-       (updater-extra-inputs . ("libnode"))))
+       (updater-extra-inputs . ("node"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
@@ -9602,17 +9602,14 @@ similar rank-based tests for equal probability distributions due to Neuhauser
              (substitute* "configure"
                (("^PKG_LIBS=.*")
                 (string-append "PKG_LIBS="
-                               (assoc-ref inputs "libnode")
-                               "/lib/libnode.so.137\n")))
-             (setenv "INCLUDE_DIR"
-                     (string-append
-                      (assoc-ref inputs "libnode")
-                      "/include/node"))
-             (setenv "LIB_DIR"
-                     (string-append
-                      (assoc-ref inputs "libnode") "/lib")))))))
+                               (search-input-file inputs "/lib/libnode.so.137")
+                               "\n"))
+               (("^PKG_CFLAGS=.*")
+                (string-append "PKG_CFLAGS=-I"
+                               (search-input-directory inputs "/include/node")
+                               "\n"))))))))
     (inputs
-     (list libnode zlib))
+     (list node-lts zlib))
     (propagated-inputs
      (list r-curl r-jsonlite r-rcpp))
     (native-inputs