From b30e1d6d9b93c393020955d95d7cb6fd562387df Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 1 Jun 2019 20:14:59 -0400 Subject: [PATCH] nodejs: use system icu Use the system icu for building nodejs. Fixes #62365 --- pkgs/development/web/nodejs/nodejs.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7364789d505a..b4213c6ed944 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -4,7 +4,7 @@ , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , gnupg , darwin, xcbuild -, procps +, procps, icu }: with stdenv.lib; @@ -30,7 +30,9 @@ let * as that would put the paths into bin/nodejs. * Including pkgconfig in build inputs would also have the same effect! */ - ]) (builtins.attrNames sharedLibDeps); + ]) (builtins.attrNames sharedLibDeps) ++ [ + "--with-intl=system-icu" + ]; copyLibHeaders = map @@ -51,10 +53,10 @@ in }; buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] - ++ [ python2 zlib libuv openssl http-parser ]; + ++ [ python2 zlib libuv openssl http-parser icu ]; - nativeBuildInputs = [ which utillinux ] - ++ optionals stdenv.isDarwin [ pkgconfig xcbuild ]; + nativeBuildInputs = [ which utillinux pkgconfig ] + ++ optionals stdenv.isDarwin [ xcbuild ]; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;