diff options
| author | Jelle Licht <jlicht@fsfe.org> | 2025-06-25 13:52:24 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:36 +0200 |
| commit | 12ec6d14391511eb857af5010d37195a39f9f4ff (patch) | |
| tree | cede9824e43ce8b879ef0a36b4eea5247d5b7163 /gnu/packages/node.scm | |
| parent | 5294db6c3894914f06bde1710225ed375c4fef73 (diff) | |
gnu: node-bootstrap: Fix build.
* gnu/packages/node.scm (node-bootstrap)[inputs]: Remove icu4c; replace
c-ares with c-ares-for-node-bootstrap.
[native-inputs]: Remove icu4c; replace c-ares with
c-ares-for-node-bootstrap. Add gcc-11.
[arguments]<#:configure-flags>: Disable intl support.
<#:phases>: No longer add references to icu4c.
[source]<snippet>: Adjust accordingly.
Change-Id: I29dd70e4660db6f485a94872dedfb52283c5a72a
Signed-off-by: Andreas Enge <andreas@enge.fr>
Diffstat (limited to 'gnu/packages/node.scm')
| -rw-r--r-- | gnu/packages/node.scm | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 4cad70a1795..0563d6eb55e 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -75,18 +75,6 @@ (modules '((guix build utils))) (snippet '(begin - ;; Patch for compatibility with ICU 68 and newer, which - ;; removed the public TRUE and FALSE macros. - (substitute* '("deps/v8/src/objects/intl-objects.cc" - "deps/v8/src/runtime/runtime-intl.cc") - (("TRUE") "true") - (("FALSE") "false")) - - ;; Patch for compatibility with ICU 75 and newer, which - ;; adds non-breaking narrow spaces. - (substitute* "test/parallel/test-intl.js" - (("12:00:00 AM") "12:00:00 AM")) - ;; Fix process.versions.XXXX assumption of always having ;; a version string of major.minor.patch and not major.minor. (substitute* "test/parallel/test-process-versions.js" @@ -115,7 +103,7 @@ "--shared-openssl" "--shared-zlib" "--without-snapshot" - "--with-intl=system-icu") + "--without-intl") ;; Run only the CI tests. The default test target requires additional ;; add-ons from NPM that are not distributed with the source. #:test-target "test-ci-js" @@ -206,7 +194,6 @@ (let* ((inputs (or native-inputs inputs)) (c-ares (assoc-ref inputs "c-ares")) (http-parser (assoc-ref inputs "http-parser")) - (icu4c (assoc-ref inputs "icu4c")) (nghttp2 (assoc-ref inputs "nghttp2")) (openssl (assoc-ref inputs "openssl")) (libuv (assoc-ref inputs "libuv")) @@ -217,7 +204,6 @@ "'ldflags': ['-Wl,-rpath=" c-ares "/lib:" http-parser "/lib:" - icu4c "/lib:" nghttp2 "/lib:" openssl "/lib:" libuv "/lib:" @@ -307,14 +293,14 @@ (format #t "nodedir=~a\n" out))))))))) (native-inputs ;; Runtime dependencies for binaries used as a bootstrap. - (list c-ares + (list c-ares-for-node-bootstrap http-parser - icu4c libuv-for-node `(,nghttp2 "lib") openssl-1.1 zlib ;; Regular build-time dependencies. + gcc-11 ; GCC > 11 produces a broken binary perl pkg-config procps @@ -327,9 +313,8 @@ (inputs (list bash-minimal coreutils - c-ares + c-ares-for-node-bootstrap http-parser - icu4c libuv-for-node `(,nghttp2 "lib") openssl |