chromium: fix increased build time for non-cross-compilation builds, add ungoogled- prefix to chromium-unwrapped, move stray patches to right location#273435
Merged
yu-re-ka merged 3 commits intoNixOS:masterfrom Dec 12, 2023
Conversation
Having ```nix host_toolchain = "//build/toolchain/linux/unbundle:host"; v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; ``` on native, non-cross-compilation builds roughly doubles the build steps and, by proxy, compute and time needed to build. So to resolve this, we conditionally change those values depending on whether we are cross-compiling or not. Co-authored-by: Adam Joseph <[email protected]>
emilylange
requested review from
a user,
Artturin,
RaitoBezarius and
networkException
ofborg
bot
added
6.topic: cross-compilation
Member
Author
|
Result of 68 packages built:
$ git describe --abbrev=40
24.05-pre-6917-g0838486e9183ce39398f01b221766e68b50f405c
$ nix-build nixos/tests/chromium.nix -A ungoogled -A stable
/nix/store/3d8kl96xz175rxrnijahfzpkfd8msg5x-vm-test-run-chromium-ungoogled
/nix/store/466dsmaf3sabbkiq795aix79lqjdf25d-vm-test-run-chromium-stablefyi @yu-re-ka: this greatly reduces the time to build electron from source as well :) |
networkException
approved these changes
Dec 11, 2023
delroth
added
the
12.approvals: 1
RaitoBezarius
approved these changes
Dec 11, 2023
delroth
added
12.approvals: 2
Contributor
|
Successfully created backport PR for |
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Supersedes #264326, which has been stale for over a month.
I decided to add two additional commits (19b4e0a and dd568a8) to this PR, as they would also trigger a full rebuild of
{ungoogled-,}chromium.More context about the cross-compilation issue is in #264326 and #229265 (comment).
This also frees up some compute ressources on
hydra.nixos.org.Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)