public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #100110 from TredwellGit/chromium

Browse Source 
chromium: speed up build and enable system ffmpeg, libjpeg, and zlib
This commit is contained in:
Michael Weiss 2020-10-13 15:07:30 +02:00 committed by GitHub
commit 89003c67a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
, glibc , glibc
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL , libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups , protobuf, speechd, libXdamage, cups
, ffmpeg_3, libxslt, libxml2, at-spi2-core , ffmpeg, libxslt, libxml2, at-spi2-core
, jre8 , jre8
, pipewire_0_2 , pipewire_0_2
@ -76,11 +76,16 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [ gnSystemLibraries = [
"flac" "libwebp" "libxslt" "opus" "snappy" "libpng" "ffmpeg"
# "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config "flac"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_* "libjpeg"
"libpng"
"libwebp"
"libxslt"
"opus"
"snappy"
"zlib"
# "re2" # fails with linker errors # "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
# "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source # so we can't build with one from system and other from source
]; ];
@ -95,7 +100,7 @@ let
libpng libcap libpng libcap
xdg_utils minizip libwebp xdg_utils minizip libwebp
libusb1 re2 zlib libusb1 re2 zlib
ffmpeg_3 libxslt libxml2 ffmpeg libxslt libxml2
nasm nasm
# harfbuzz # in versions over 63 harfbuzz and freetype are being built together # harfbuzz # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source # so we can't build with one from system and other from source
@ -262,6 +267,7 @@ let
is_clang = stdenv.cc.isClang; is_clang = stdenv.cc.isClang;
clang_use_chrome_plugins = false; clang_use_chrome_plugins = false;
blink_symbol_level = 0; blink_symbol_level = 0;
symbol_level = 0;
fieldtrial_testing_like_official_build = true; fieldtrial_testing_like_official_build = true;
# Google API keys, see: # Google API keys, see: