From eb74717477bd782d202495e05afcbeefc4c26bb3 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Fri, 9 Oct 2020 21:29:16 +0000 Subject: [PATCH] chromium: enable system ffmpeg, libjpeg, and zlib --- .../networking/browsers/chromium/common.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cd61565eebfb..abafd57d1633 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