diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2022-04-30 18:39:57 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2022-05-26 11:54:44 +0200 |
| commit | d641d1074d86384f5262f12240dfca1c866552f6 (patch) | |
| tree | ea785c48914b03b928f8eac5d4b66e19b58c7256 | |
| parent | chromiumBeta: Fix the configuration phase (diff) | |
| download | nixpkgs-d641d1074d86384f5262f12240dfca1c866552f6.tar.gz | |
chromiumBeta: Fix a compilation error
LLVM 14 doesn't support those build flags yet
(-no-opaque-pointers is the argument for -Xclang):
error: unknown argument: '-no-opaque-pointers'
Those build flags were added in the following commit:
https://source.chromium.org/chromium/chromium/src/+/003067c130958bb2f867324cd675b4e5d1efbf00
(cherry picked from commit 7f684c2ba0a35ecdee3c1dcc5fb15e0fcb4be581)
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index d6ae683af732..4ad145ee17ed 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -166,6 +166,10 @@ let # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361: substituteInPlace BUILD.gn \ --replace '"//infra/orchestrator:orchestrator_all",' "" + # Disable build flags that require LLVM 15: + substituteInPlace build/config/compiler/BUILD.gn \ + --replace '"-Xclang",' "" \ + --replace '"-no-opaque-pointers",' "" '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do |