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

Merge pull request #62447 from matthewbauer/nodejs-use-icu 

nodejs: use system icu
This commit is contained in:
Matthew Bauer 2019-06-03 16:12:44 -04:00 committed by GitHub
parent 8c09536ef1 c3677ed0ef
commit 00a9a80174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 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;

4
pkgs/development/web/nodejs/v12.nix
View File

@ -1,7 +1,7 @@
{ stdenv, callPackage, lib, openssl, enableNpm ? true }: { stdenv, callPackage, lib, openssl, icu, enableNpm ? true }:
let let
buildNodejs = callPackage ./nodejs.nix { inherit openssl; }; buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };
in in
buildNodejs { buildNodejs {
inherit enableNpm; inherit enableNpm;

2
pkgs/top-level/all-packages.nix
View File

@ -4205,10 +4205,12 @@ in
}; };
nodejs-12_x = callPackage ../development/web/nodejs/v12.nix { nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
openssl = openssl_1_1; openssl = openssl_1_1;
icu = icu63;
}; };
nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix { nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
enableNpm = false; enableNpm = false;
openssl = openssl_1_1; openssl = openssl_1_1;
icu = icu63;
}; };
# Update this when adding the newest nodejs major version! # Update this when adding the newest nodejs major version!