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

chromiumDev: Revert a patch to fix the build with LLVM 12

Browse Source 
The build was failing with:
clang++: error: unknown argument: '-fsanitize-ignorelist=../../tools/cfi/ignores.txt'

(cherry picked from commit 950b321244d541e3c4d05bb163912d53c6c063df)
This commit is contained in:
Michael Weiss 2021-06-08 21:12:07 +02:00
parent 146ff19f4f
commit b6a71637a9
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,9 +54,9 @@ let
# source tree. # source tree.
extraAttrs = buildFun base; extraAttrs = buildFun base;
githubPatch = commit: sha256: fetchpatch { githubPatch = { commit, sha256, revert ? false }: fetchpatch {
url = "https://github.com/chromium/chromium/commit/${commit}.patch"; url = "https://github.com/chromium/chromium/commit/${commit}.patch";
inherit sha256; inherit sha256 revert;
}; };
mkGnFlags = mkGnFlags =
@ -166,6 +166,14 @@ let
# Fix the build by adding a missing dependency (s. https://crbug.com/1197837): # Fix the build by adding a missing dependency (s. https://crbug.com/1197837):
./patches/fix-missing-atspi2-dependency.patch ./patches/fix-missing-atspi2-dependency.patch
./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch
] ++ lib.optionals (chromiumVersionAtLeast "93") [
# We need to revert this patch to build M93 with LLVM 12.
(githubPatch {
# Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/."
commit = "9d080c0934b848ee4a05013c78641e612fcc1e03";
sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c";
revert = true;
})
]; ];
postPatch = '' postPatch = ''