Merge pull request #28170 from ambrop72/chromium-fix3

Restore Chromium update in release-17.03, fix beta build
NixOS · Aug 26, 2017 · e56d163 · e56d163
2 parents ce331cc + c4f199a
commit e56d163
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git 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
@@ -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',
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1rxc555l3bxczg9vigr2p0y7j1gswy99gs5yhkbj3raakym32563";
-    sha256bin64 = "1j29njdfmby3ym8a7r4v3id645d1804j8s3kpi430jkl7dx7sla6";
-    version = "59.0.3071.86";
+    sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
+    sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m";
+    version = "60.0.3112.78";
   };
   dev = {
-    sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8";
-    sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal";
-    version = "60.0.3095.5";
+    sha256 = "0b8bzxnnzfl17vw0gwds89zjc4z4zi6fdz8f97w3x8a5ad0c2h5i";
+    sha256bin64 = "1n1q6g7avw4yrzdhpzq0pfd12k1fb18hc01jqnq2ak0aisdaga72";
+    version = "61.0.3163.13";
   };
   stable = {
-    sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j";
-    sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id";
-    version = "58.0.3029.110";
+    sha256 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
+    sha256bin64 = "0wbqbbq9zxizfbjxj241nhk1qgjq91db0lzzbkm5hjvjhx6war4s";
+    version = "60.0.3112.78";
   };
 }