Skip to content

[Backport release-23.11] chromium: fix increased build time for non-cross-compilation builds, add ungoogled- prefix to chromium-unwrapped, move stray patches to right location#273752

Merged
emilylange merged 3 commits intorelease-23.11from
backport-273435-to-release-23.11
Dec 13, 2023

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Dec 12, 2023

Bot-based backport to release-23.11, triggered by a label in #273435.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

emilylange and others added 3 commits December 12, 2023 11:34
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]>
(cherry picked from commit 5dec2c9)
@ofborg ofborg bot added 6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 12, 2023
@emilylange
Copy link
Member

Result of nixpkgs-review pr 273752 run on x86_64-linux 1

67 packages built:
  • authy
  • bilibili
  • bitwarden
  • camunda-modeler
  • chromium
  • chromium.sandbox
  • deltachat-desktop
  • drawio
  • drawio-headless
  • electron (electron_27)
  • electron_26
  • electron_28
  • element-desktop
  • element-desktop-wayland
  • fast-cli
  • freetube
  • headset
  • heroic
  • heroic-unwrapped
  • itch
  • jitsi-meet-electron
  • mattermost-desktop
  • mermaid-cli
  • mermaid-filter
  • micropad
  • nix-tour
  • open-stage-control
  • pandoc-drawio-filter
  • pandoc-drawio-filter.dist
  • percollate
  • playwright-test
  • pocket-casts
  • podman-desktop
  • pritunl-client
  • puppeteer-cli
  • python310Packages.mkdocs-drawio-exporter
  • python310Packages.mkdocs-drawio-exporter.dist
  • python310Packages.pytest-playwright
  • python310Packages.pytest-playwright.dist
  • python311Packages.mkdocs-drawio-exporter
  • python311Packages.mkdocs-drawio-exporter.dist
  • python311Packages.pytest-playwright
  • python311Packages.pytest-playwright.dist
  • redisinsight
  • revolt-desktop
  • sharedown
  • sitespeed-io
  • standardnotes
  • stretchly
  • super-productivity
  • teams-for-linux
  • terra-station
  • thedesk
  • threema-desktop
  • tutanota-desktop
  • uhk-agent
  • uhk-udev-rules
  • uivonim
  • ungoogled-chromium
  • ungoogled-chromium.sandbox
  • vesktop
  • vhs
  • vieb
  • wayback
  • webcord
  • webcord-vencord
  • webtorrent_desktop

$ git describe --abbrev=40
23.11-829-g86106d953af7f0d32679c73733723164a9863de2
$ nix-build nixos/tests/chromium.nix -A ungoogled -A stable
/nix/store/w5ksdkgniskq8ar6iyklrz93vpnwri34-vm-test-run-chromium-ungoogled
/nix/store/gbmq36bvwa9bndxxw9vz6xv2cmaz1m9k-vm-test-run-chromium-stable

@emilylange emilylange merged commit 867ebbd into release-23.11 Dec 13, 2023
@emilylange emilylange deleted the backport-273435-to-release-23.11 branch December 13, 2023 02:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant