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

chromiumBeta: Build with LLVM 13

Browse Source 
(cherry picked from commit 403ce1a9a3624e7b87606b99ea15f531fa17f8e7)
This commit is contained in:
Michael Weiss 2021-08-11 22:57:23 +02:00
parent 905b1242d8
commit 3670f55599
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,14 +171,6 @@ let
./patches/widevine-79.patch ./patches/widevine-79.patch
# 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
] ++ 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 = ''

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -38,7 +38,7 @@ let
inherit (upstream-info.deps.gn) url rev sha256; inherit (upstream-info.deps.gn) url rev sha256;
}; };
}); });
} // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "94") rec { } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec {
llvmPackages = llvmPackages_13; llvmPackages = llvmPackages_13;
stdenv = llvmPackages.stdenv; stdenv = llvmPackages.stdenv;
}); });