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

chromiumDev: Fix the build

Browse Source 
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.

(cherry picked from commit bd22d2425cb7f14b1f98f7432e6ad38208609adb)
This commit is contained in:
Michael Weiss 2021-07-27 19:46:41 +02:00
parent 4dbbc50b30
commit cb026a4a09
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,15 +75,16 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
# https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py
gnSystemLibraries = [ gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [
"ffmpeg" "ffmpeg"
"snappy"
] ++ [
"flac" "flac"
"libjpeg" "libjpeg"
"libpng" "libpng"
"libwebp" "libwebp"
"libxslt" "libxslt"
"opus" "opus"
"snappy"
"zlib" "zlib"
]; ];