From bafcf4226ead4a6bdc5d652164e4d18509af35a7 Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Fri, 12 May 2017 13:22:39 +0200 Subject: [PATCH] chromium: add bootstrap gn patch --- .../networking/browsers/chromium/common.nix | 1 + .../browsers/chromium/patches/fix-bootstrap-gn.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dac821a4898f..fc7483d2fa2b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -105,6 +105,7 @@ let patches = [ ./patches/nix_plugin_paths_52.patch + ./patches/fix-bootstrap-gn.patch ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch ++ optional enableWideVine ./patches/widevine.patch; diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch new file mode 100644 index 000000000000..34efb4f7a456 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch @@ -0,0 +1,12 @@ +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 3148ccf..38cfb11 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/base_switches.cc', + 'base/build_time.cc', + 'base/callback_internal.cc', ++ 'base/callback_helpers.cc', + 'base/command_line.cc', + 'base/debug/activity_tracker.cc', + 'base/debug/alias.cc',