public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nodejs: use system icu

Browse Source 
Use the system icu for building nodejs.

Fixes #62365
This commit is contained in:
Matthew Bauer 2019-06-01 20:14:59 -04:00
parent 67abc01e4c
commit b30e1d6d9b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/web/nodejs/nodejs.nix
View File

@ -4,7 +4,7 @@
, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell
, gnupg , gnupg
, darwin, xcbuild , darwin, xcbuild
, procps , procps, icu
}: }:
with stdenv.lib; with stdenv.lib;
@ -30,7 +30,9 @@ let
* as that would put the paths into bin/nodejs. * as that would put the paths into bin/nodejs.
* Including pkgconfig in build inputs would also have the same effect! * Including pkgconfig in build inputs would also have the same effect!
*/ */
]) (builtins.attrNames sharedLibDeps); ]) (builtins.attrNames sharedLibDeps) ++ [
"--with-intl=system-icu"
];
copyLibHeaders = copyLibHeaders =
map map
@ -51,10 +53,10 @@ in
}; };
buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ] buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]
++ [ python2 zlib libuv openssl http-parser ]; ++ [ python2 zlib libuv openssl http-parser icu ];
nativeBuildInputs = [ which utillinux ] nativeBuildInputs = [ which utillinux pkgconfig ]
++ optionals stdenv.isDarwin [ pkgconfig xcbuild ]; ++ optionals stdenv.isDarwin [ xcbuild ];
configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags; configureFlags = sharedConfigureFlags ++ [ "--without-dtrace" ] ++ extraConfigFlags;