From ab94e80601a5b23f44e7455b3443457b4a99a1e5 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Fri, 27 Oct 2023 18:02:29 +0200 Subject: gnu: node-lts: Update to 18.18.2. * gnu/packages/node.scm (node-lts): Update to 18.18.2. [arguments]: Add 'install-node-gyp-wrapper phase. Change-Id: I6b17de33313505558a8fa9560126adef486fd0e3 --- gnu/packages/node.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d769066dc4..6e30ad486a 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -738,14 +738,14 @@ source files.") (define-public node-lts (package (inherit node) - (version "18.17.1") + (version "18.18.2") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.gz")) (sha256 (base32 - "0dachvhf5jxrb1av8mn2dikbhwklxsgc9y2zg4h50fcwh5d54mqi")) + "0ci1faxjsbp0lv05kskh5anfljn6zawqcf7dawiby5d5qg7x572h")) (modules '((guix build utils))) (snippet '(begin @@ -903,7 +903,26 @@ source files.") "/lib/node_modules/npm/node_modules" "/tar/lib/write-entry.js"))) (substitute* file - (("this.stat.nlink > 1") "false"))))))))) + (("this.stat.nlink > 1") "false"))))) + (add-after 'install 'install-node-gyp-wrapper + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/lib/node_modules/npm/bin/node-gyp-bin")) + (file (string-append dir "/node-gyp"))) + (mkdir-p dir) + ;; See https://github.com/npm/cli/issues/6842 + (call-with-output-file file + (lambda (port) + (format port "#!~a/bin/sh +if [ \"x$npm_config_node_gyp\" = \"x\" ]; then + ~a/bin/node \"~a/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js\" \"$@\" +else + \"$npm_config_node_gyp\" \"$@\" +fi" + (assoc-ref inputs "bash") + out + out))) + (chmod file #o555)))))))) (native-inputs (list ;; Runtime dependencies for binaries used as a bootstrap. c-ares-for-node -- cgit v1.2.3