From 1fe7bd9ed6a5dd780e4991241b75fc0640576b2b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 14 May 2017 15:03:21 +0200 Subject: [PATCH] chromium: softlink system nodejs into third_party somehow, the build seems to have changed with chromium 58, to not auto download the node binary. It is needed to generate webui files and we can substitute our own. --- pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index fc7483d2fa2..f36f28ac880 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which +{ stdenv, ninja, which, nodejs # default dependencies , bzip2, flac, speex, libopus @@ -87,7 +87,7 @@ let nativeBuildInputs = [ ninja which python2Packages.python perl pkgconfig - python2Packages.ply python2Packages.jinja2 + python2Packages.ply python2Packages.jinja2 nodejs ]; buildInputs = defaultDependencies ++ [ @@ -131,6 +131,9 @@ let }' gpu/config/gpu_control_list.cc patchShebangs . + # use our own nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node '' + optionalString (versionAtLeast version "52.0.0.0") '' sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ third_party/pdfium/xfa/fxbarcode/utils.h