diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-01 20:14:59 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-01 20:17:17 -0400 |
| commit | b30e1d6d9b93c393020955d95d7cb6fd562387df (patch) | |
| tree | 02212e532800482cc0747e0034a1ae9930a1ecb9 /pkgs/development/web | |
| parent | 67abc01e4c69e9eaabbf9a6702fba910ff3604cd (diff) | |
| download | nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar.gz nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar.bz2 nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar.lz nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar.xz nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.tar.zst nixpkgs-b30e1d6d9b93c393020955d95d7cb6fd562387df.zip | |
nodejs: use system icu
Use the system icu for building nodejs. Fixes #62365
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/nodejs.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 7364789d505..b4213c6ed94 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; |