From 445658bbe134eea0eb39d5ee6d93f1608a4f6345 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Wed, 13 Jul 2022 21:57:35 +0200
Subject: [PATCH] gnu: node: Build with nghttp2@1.44.0.

* gnu/packages/web.scm (nghttp2-for-node): New variable.
* gnu/packages/node.scm (node, node-lts)[native-inputs, inputs]: Change from
NGHTTP2 to NGHTTP2-FOR-NODE.
---
 gnu/packages/node.scm |  8 ++++----
 gnu/packages/web.scm  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index c8d81fbd22..c757d202eb 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -289,7 +289,7 @@
            http-parser
            icu4c
            libuv
-           `(,nghttp2 "lib")
+           `(,nghttp2-for-node "lib")
            openssl
            zlib
            ;; Regular build-time dependencies.
@@ -309,7 +309,7 @@
            http-parser
            icu4c
            libuv
-           `(,nghttp2 "lib")
+           `(,nghttp2-for-node "lib")
            openssl
            python-wrapper               ;for node-gyp (supports python3)
            zlib))
@@ -866,7 +866,7 @@ source files.")
            brotli
            icu4c-70
            libuv-for-node
-           `(,nghttp2 "lib")
+           `(,nghttp2-for-node "lib")
            openssl
            zlib
            ;; Regular build-time dependencies.
@@ -883,7 +883,7 @@ source files.")
            libuv-for-node
            llhttp-bootstrap
            brotli
-           `(,nghttp2 "lib")
+           `(,nghttp2-for-node "lib")
            openssl
            python-wrapper ;; for node-gyp (supports python3)
            zlib))))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8fef63a896..2397c8b64f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7568,6 +7568,22 @@ compressed JSON header blocks.
 @end itemize\n")
     (license license:expat)))
 
+;; Older variant for Node versions < 17 (upstream commit 43291b98edaa682
+;; add support for newer nghttp2, but is difficult to backport).
+(define-public nghttp2-for-node
+  (hidden-package
+   (package
+     (inherit nghttp2)
+     (version "1.44.0")
+     (source (origin
+               (method url-fetch)
+               (uri (string-append "https://github.com/nghttp2/nghttp2/"
+                                   "releases/download/v" version "/"
+                                   "nghttp2-" version ".tar.xz"))
+               (sha256
+                (base32
+                 "0p9wvva4g8hwj55x19rbyvnq2dbsnf65rphhxnpqs7ll54xlg6an")))))))
+
 (define-public hpcguix-web
   (package
     (name "hpcguix-web")