diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-10-13 15:07:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 15:07:30 +0200 |
| commit | 89003c67a15b4115aaf7f41a2f93e8d139d7ca83 (patch) | |
| tree | 322b050a13fe7ac2c6648bc04023ecfcabb3b23f /pkgs/applications/networking | |
| parent | ff69f8b0bbe371033cb5c902bb02c1e0562bcadc (diff) | |
| parent | eb74717477bd782d202495e05afcbeefc4c26bb3 (diff) | |
Merge pull request #100110 from TredwellGit/chromium
chromium: speed up build and enable system ffmpeg, libjpeg, and zlib
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 663d66870b507..7de238dae8ef3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -15,7 +15,7 @@ , glibc , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups -, ffmpeg_3, libxslt, libxml2, at-spi2-core +, ffmpeg, libxslt, libxml2, at-spi2-core , jre8 , pipewire_0_2 @@ -76,11 +76,16 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); gnSystemLibraries = [ - "flac" "libwebp" "libxslt" "opus" "snappy" "libpng" - # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config - # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + "ffmpeg" + "flac" + "libjpeg" + "libpng" + "libwebp" + "libxslt" + "opus" + "snappy" + "zlib" # "re2" # fails with linker errors - # "ffmpeg" # https://crbug.com/731766 # "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 ]; @@ -95,7 +100,7 @@ let libpng libcap xdg_utils minizip libwebp libusb1 re2 zlib - ffmpeg_3 libxslt libxml2 + ffmpeg libxslt libxml2 nasm # 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 @@ -262,6 +267,7 @@ let is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; blink_symbol_level = 0; + symbol_level = 0; fieldtrial_testing_like_official_build = true; # Google API keys, see: |