From 0ffd59abd82174e186e3406238845ecbc847fad2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Tue, 7 Apr 2020 13:34:47 +0200 Subject: [PATCH] firefox: use nodejs-12_x for firefox >= 75 --- pkgs/applications/networking/browsers/firefox/common.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c0693dbe9e3a..01bf071d79bb 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,6 +21,7 @@ , rustc_1_41 , cargo_1_41 , rust-cbindgen_0_1_13 +, nodejs-12_x , debugBuild ? false @@ -129,6 +130,7 @@ let rustc_pkg = if lib.versionAtLeast ffversion "73" then rustc_1_41 else rustc; cargo_pkg = if lib.versionAtLeast ffversion "73" then cargo_1_41 else cargo; cbindgen_pkg = if lib.versionAtLeast ffversion "73" then rust-cbindgen_0_1_13 else rust-cbindgen; + nodejs_pkg = if lib.versionAtLeast ffversion "75" then nodejs-12_x else nodejs; in @@ -194,7 +196,7 @@ stdenv.mkDerivation (rec { ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] - ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ cbindgen_pkg nodejs ] + ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ cbindgen_pkg nodejs_pkg ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs;