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

chromium: fix M124+ build by using the vendored libwebp

Browse Source 
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).
This commit is contained in:
emilylange 2024-04-17 13:16:29 +02:00
parent 2dd80cf5d2
commit d93b17c0d4
No known key found for this signature in database
GPG Key ID: 0AD773CE46FD0F87
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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"
];