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

chromium: set TERM=dumb for ninja & chromium: do not skip {pre,post}Build #229367

Merged
merged 2 commits into from
May 2, 2023

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented May 1, 2023

In pkgs/development/tools/build-managers/ninja/setup-hook.sh,
ninjaBuildPhase() sets TERM=dumb for the invocation of ninja
in order to get progress output even when running on a remote
builder. Let's do the same here, since we don't use
ninjaBuildPhase().###### Description of changes

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Adam Joseph added 2 commits May 1, 2023 23:58
In pkgs/development/tools/build-managers/ninja/setup-hook.sh,
`ninjaBuildPhase()` sets `TERM=dumb` for the invocation of `ninja`
in order to get progress output even when running on a remote
builder.  Let's do the same here, since we don't use
`ninjaBuildPhase()`.
When overriding `buildPhase` it is important to remember to
explicitly call `runHook preBuild` and `runHook postBuild`.

I forget to do this all the time.
@Artturin Artturin marked this pull request as ready for review May 1, 2023 21:12
@Artturin Artturin merged commit 2816ca9 into NixOS:master May 2, 2023
@Artturin Artturin deleted the generalchromiumimp branch May 2, 2023 14:36
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.

1 participant