summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-06-02 17:34:27 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2019-06-02 17:34:27 -0400
commitc3677ed0ef6856b393831c863795e58bb08ac19a (patch)
treea9c555b9c713c5867359a820f10202bf7fe4c0aa
parentb30e1d6d9b93c393020955d95d7cb6fd562387df (diff)
downloadnixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar.gz
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar.bz2
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar.lz
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar.xz
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.tar.zst
nixpkgs-c3677ed0ef6856b393831c863795e58bb08ac19a.zip
nodejs: use icu63 for nodejs12
-rw-r--r--pkgs/development/web/nodejs/v12.nix4
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix
index 06eb3e45e6f..d56dc8666fa 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 f3888fe8dda..89f421daf6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4201,10 +4201,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!