diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-06-28 12:43:37 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-06-29 11:37:05 +0200 |
commit | fcdcb819362836505e059ef1c5cb33c737883400 (patch) | |
tree | aa2c7415b8f9b33e2279b078a2558a98d5431620 /pkgs/applications/networking/browsers | |
parent | bcd6993fae602c1799466c05e4c9aaf570e1d6f3 (diff) |
chromiumDev: Fix build errors due to the older system FFmpeg
The final linking still fails though, even with llvm-git. We might have to diable use_thin_lto for now: ld.lld: error: undefined symbol: snappy::Compress(char const*, unsigned long, std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >*) >>> referenced by compression_module.cc >>> thinlto-cache/Thin-ed5ed5.tmp.o:(reporting::CompressionModule::CompressRecord(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, base::OnceCallback<void (std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >, absl::optional<reporting::CompressionInformation>)>) const) clang-13: error: linker command failed with exit code 1 (use -v to see invocation)
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 18565f31a2fb3..e8664690df290 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -175,6 +175,18 @@ let sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; revert = true; }) + # To fix build errors with the older system FFmpeg: + (githubPatch { + # unbundle: add libavcodec/packet.h to shim headers + commit = "e4d228ec30607b06bf3fed77497abef89c29966a"; + sha256 = "02jg2bdmgjcpmk6alb72jc93wy3nf2fpa72hb4aarq337i2mwn4v"; + }) + (githubPatch { + # Roll src/third_party/ffmpeg/ 7e1d53a09..cf7ee6598 (1000 commits) + commit = "3ec3b2992238d4b4764f99f04605e154688c7990"; + sha256 = "1fwb154s5qcis490rvcvm14zrmaj59g5lg9zg8ada36vw9hycbrf"; + revert = true; + }) ]; postPatch = '' |