diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-03 16:12:44 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-03 16:12:44 -0400 |
commit | 00a9a801742d7a5533411bec54d8fb14f50fcb0f (patch) | |
tree | 0dbd111a53be8324f0cdf828764e5d4e4a2442fc /pkgs | |
parent | 8c09536ef10e72c9421c05403c68134480ba7fde (diff) | |
parent | c3677ed0ef6856b393831c863795e58bb08ac19a (diff) |
Merge pull request #62447 from matthewbauer/nodejs-use-icu
nodejs: use system icu
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 12 | ||||
-rw-r--r-- | pkgs/development/web/nodejs/v12.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7364789d505a9..b4213c6ed944d 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 06eb3e45e6fcd..d56dc8666fad2 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 06c9443b1c094..d1be0e0686914 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! |