diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2021-07-27 19:46:41 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2021-07-27 19:51:05 +0200 |
| commit | bd22d2425cb7f14b1f98f7432e6ad38208609adb (patch) | |
| tree | eb50278277415a213fdb099547e41f7bf9261857 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 407ef1dc6f91f9ecf7f61e4dfaedcde052f2bd17 (diff) | |
| download | nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar.gz nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar.bz2 nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar.lz nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar.xz nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.tar.zst nixpkgs-bd22d2425cb7f14b1f98f7432e6ad38208609adb.zip | |
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.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 6daafc204eb..377835489a2 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" ]; |