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; diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 06eb3e45e6fc..d56dc8666fad 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -1,7 +1,7 @@ -{ stdenv, callPackage, lib, openssl, enableNpm ? true }: +{ stdenv, callPackage, lib, openssl, icu, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; }; in buildNodejs { inherit enableNpm; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 06c9443b1c09..d1be0e068691 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4205,10 +4205,12 @@ in }; nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { openssl = openssl_1_1; + icu = icu63; }; nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { enableNpm = false; openssl = openssl_1_1; + icu = icu63; }; # Update this when adding the newest nodejs major version!