Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] Backport LLVM 11 to build Chromium M86 #98856

Merged
merged 7 commits into from Sep 27, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Sep 26, 2020

Motivation for this change

We'll need a working build of Chromium M86 for NixOS 20.03 to provide
security updates for 30 days after the release of 20.09.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

primeos and others added 7 commits September 26, 2020 12:50
This is simply the result of:
cp -r pkgs/development/compilers/llvm/10 pkgs/development/compilers/llvm/11/

(cherry picked from commit 28f2797)
http://lists.llvm.org/pipermail/release-testers/2020-July/001305.html

TODO: Enable Polly.

Co-authored-by: conferno <conferno@camfex.cz>
(cherry picked from commit 0a8334d)
Ok, so I was about to update the patch (didn't apply anymore) when I
also started looking at it's usage and realized that
NIX_CHROMIUM_PLUGIN_PATH_ (and other substrings) only appears in the
patch itself (i.e. it seemed like we don't need this patch anymore).

Turns out that we have this patch since 2014 (1b84fbf) and it was
only ever used for NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE (and from the log
it isn't clear if/when or how well that worked). But in 2019 that last
usage got removed (545d58a) so we should be able to safely drop this
patch now :) \o/

(I just wanted to note that as it seemed somewhat of a funny story :D
But there is of course nothing wrong with it.)
Git history (git log --oneline -S NIX_CHROMIUM_PLUGIN_PATH_):
7205bd6 ungoogled-chromium: init at 81.0.4044.92-2
545d58a chromium: fix widevine
cd3283f chromium: 67.0.3396.99 -> 68.0.3440.75
72d7b5d chromium: fix nix_plugin_paths for 68+
7a3a16d chromium: Remove plugin paths patch for version 50
79d18eb chromium: Update dev channel to v52.0.2743.10
c7a3645 chromium: Remove stuff for versions <= v51
8b97ca2 chromium: Update all channels to latest versions
b9093f1 chromium: Updates, fixes NixOS#11492
471cdd1 chromium: Update beta and dev channels.
5c6aa39 chromium: Cleanup old patch and update stable
af54ddf chromium: Drop plugin_paths patch for old versions.
6a8afa4 chromium: Fix plugin_paths patch for version 44.
0aad4b7 chromium: Update all channels to latest versions.
1b84fbf chromium: Allow env vars for passing plugin paths.

(cherry picked from commit 2213c46)
I didn't look into this yet but IIRC M86 will finally have a flag for
Linux to enable VA-API. So we shouldn't need
enable-video-acceleration-on-linux.patch anymore.

But we likely need to update enable-vdpau-support-for-nvidia.patch
when/before M86 hits the stable channel if we want to keep VDPAU
support.

(cherry picked from commit bf0e13a)
Note: The following might also need to be updated:
substituteStream(): WARNING: pattern '/usr/share/xcb' doesn't match anything in file 'ui/gfx/x/BUILD.gn'

(cherry picked from commit 8815c9e)
We'll need a working build of Chromium M86 for NixOS 20.03 to provide
security updates for 30 days after the release of 20.09.
@primeos primeos marked this pull request as draft September 26, 2020 12:17
@primeos
Copy link
Member Author

primeos commented Sep 26, 2020

@GrahamcOfBorg build clang_11

@ofborg ofborg bot requested review from 7c6f434c and dtzWill September 26, 2020 13:33
@primeos primeos marked this pull request as ready for review September 27, 2020 09:33
@primeos primeos merged commit d110708 into NixOS:release-20.03 Sep 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants