From bd22d2425cb7f14b1f98f7432e6ad38208609adb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Jul 2021 19:46:41 +0200 Subject: chromiumDev: Fix the build Our system FFmpeg version is too outdated and Snappy causes a linking failure (I didn't have time to investigate yet). Hopefully we can revert this before the stable release of M93. --- pkgs/applications/networking/browsers/chromium/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6daafc204eb8..377835489a2b 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -75,15 +75,16 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = [ + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ "ffmpeg" + "snappy" + ] ++ [ "flac" "libjpeg" "libpng" "libwebp" "libxslt" "opus" - "snappy" "zlib" ]; -- cgit 1.4.1