diff options
| author | emilylange <git@emilylange.de> | 2024-04-17 13:16:29 +0200 |
|---|---|---|
| committer | emilylange <git@emilylange.de> | 2024-04-17 13:16:29 +0200 |
| commit | d93b17c0d4f3dffd0c3b68d618a453a5f94c3209 (patch) | |
| tree | 7ff188874621d750297ca22f8b070bcb045c2ba2 /pkgs/applications/networking/browsers | |
| parent | 2dd80cf5d28282854550e6eaa4517daa672f24b5 (diff) | |
chromium: fix M124+ build by using the vendored libwebp
at least until we figure out how to use our libwebp again. Works around the following error in the configure phase (pretty quick to reproduce): ~~~ Running phase: configurePhase ERROR Unresolved dependencies. //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default) needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default) ~~~ The lib.optionals saves us from rebuilding < M124 (ungoogled-chromium at this HEAD and all of electron-source).
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 54697febefe32..400c61130111e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -102,7 +102,14 @@ let "flac" "libjpeg" "libpng" + ] ++ lib.optionals (!chromiumVersionAtLeast "124") [ + # Use the vendored libwebp for M124+ until we figure out how to solve: + # Running phase: configurePhase + # ERROR Unresolved dependencies. + # //third_party/libavif:libavif_enc(//build/toolchain/linux/unbundle:default) + # needs //third_party/libwebp:libwebp_sharpyuv(//build/toolchain/linux/unbundle:default) "libwebp" + ] ++ [ "libxslt" # "opus" ]; |