From c4f199a99170fffaa8b627754f2ce302e99d19b6 Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Fri, 11 Aug 2017 20:52:20 +0200 Subject: [PATCH] chromium: fix beta version build Fixes build error https://nix-cache.s3.amazonaws.com/log/0vb420kj4ys98k4ayq1sxkclkhlkazzx-chromium-60.0.3112.78.drv --- .../networking/browsers/chromium/common.nix | 4 +++- .../browsers/chromium/patches/fix-bootstrap-gn-2.patch | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 09fce2e9e15c..a241be3f1e51 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -114,7 +114,9 @@ let ./patches/fix_network_api_crash.patch ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch ++ optional enableWideVine ./patches/widevine.patch - ++ optional (versionOlder version "59.0.0.0") ./patches/fix-bootstrap-gn.patch; + ++ optional (versionOlder version "59.0.0.0") ./patches/fix-bootstrap-gn.patch + ++ optional (versionAtLeast version "60.0.0.0" && versionOlder version "61.0.0.0") + ./patches/fix-bootstrap-gn-2.patch; postPatch = '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch new file mode 100644 index 000000000000..10d277d1c4e1 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch @@ -0,0 +1,10 @@ +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -487,6 +487,7 @@ + 'base/sys_info.cc', + 'base/task_runner.cc', + 'base/task_scheduler/delayed_task_manager.cc', ++ 'base/task_scheduler/environment_config.cc', + 'base/task_scheduler/post_task.cc', + 'base/task_scheduler/priority_queue.cc', + 'base/task_scheduler/scheduler_lock_impl.cc',