Merge pull request #171048 from primeos/chromiumBeta

chromiumBeta: Fix a compilation error
2022-04-30 20:04:40 +02:00 · 2022-04-30 20:04:40 +02:00 · 7a5785d6ae
commit 7a5785d6ae
parent 624320b1a5 7f684c2ba0
1 changed files with 4 additions and 0 deletions
--- 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