Merge pull request #62447 from matthewbauer/nodejs-use-icu
nodejs: use system icu
This commit is contained in:
commit
00a9a80174
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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!
|
||||
|
Loading…
Reference in New Issue
Block a user