Skip to content

[staging-next] chromium: fix building M125 with ninja 1.12#319332

Merged
K900 merged 1 commit intoNixOS:staging-nextfrom
emilylange:staging-ninja-1.12-chromium-M125
Jun 12, 2024
Merged

[staging-next] chromium: fix building M125 with ninja 1.12#319332
K900 merged 1 commit intoNixOS:staging-nextfrom
emilylange:staging-ninja-1.12-chromium-M125

Conversation

@emilylange
Copy link
Member

Description of changes

Solves the following build error:

FAILED: obj/chrome/browser/devtools/devtools/devtools_window.o In file included from ../../chrome/browser/devtools/devtools_window.cc:32: ../../chrome/browser/file_select_helper.h:16:10: fatal error: 'components/enterprise/buildflags/buildflags.h' file not found
 16 | #include "components/enterprise/buildflags/buildflags.h"
    |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Can be removed once chromium and ungoogled-chromium are both on M126, since the patch is from M126.

https://issues.chromium.org/issues/336911498
https://chromium-review.googlesource.com/c/chromium/src/+/5487538

#316075 (comment)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Solves the following build error:

~~~
FAILED: obj/chrome/browser/devtools/devtools/devtools_window.o
In file included from ../../chrome/browser/devtools/devtools_window.cc:32:
../../chrome/browser/file_select_helper.h:16:10: fatal error: 'components/enterprise/buildflags/buildflags.h' file not found
 16 | #include "components/enterprise/buildflags/buildflags.h"
    |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~

Can be removed once chromium and ungoogled-chromium are both on M126,
since the patch is from M126.

https://issues.chromium.org/issues/336911498
https://chromium-review.googlesource.com/c/chromium/src/+/5487538
@emilylange emilylange requested a review from vcunat June 12, 2024 14:04
@emilylange emilylange changed the title chromium: fix building M125 with ninja 1.12 [staging-next] chromium: fix building M125 with ninja 1.12 Jun 12, 2024
@K900 K900 merged commit 2ff09ea into NixOS:staging-next Jun 12, 2024
@emilylange emilylange deleted the staging-ninja-1.12-chromium-M125 branch June 12, 2024 14:15
@vcunat vcunat mentioned this pull request Jun 12, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments