nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

chromium: fix beta version build

Browse Source 
Fixes build error https://nix-cache.s3.amazonaws.com/log/0vb420kj4ys98k4ayq1sxkclkhlkazzx-chromium-60.0.3112.78.drv
This commit is contained in:
Ambroz Bizjak
2017-08-11 20:52:20 +02:00
parent 31633b1397
commit c4f199a991
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@@ -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

10
pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn-2.patch Normal file
View File

@@ -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',