electron_31: fix build after llvm bump

[emilylange]

Fixes #368172

This fixes the following build errors:

[2607/50420] CXX obj/third_party/perfetto/src/tracing/client_api_without_backends/track_event_legacy.o FAILED: obj/third_party/perfetto/src/tracing/client_api_without_backends/track_event_legacy.o clang++ -MD -MF [...]
In file included from ../../third_party/perfetto/src/tracing/track_event_legacy.cc:17: In file included from ../../third_party/perfetto/include/perfetto/tracing/track_event_legacy.h:26: In file included from ../../third_party/perfetto/include/perfetto/tracing/track_event.h:20: ../../third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h:331:20: error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]
  331 |     Base::template Trace([](typename Base::TraceContext ctx) { ctx.Flush(); });
      |                    ^
[...]
6 errors generated.

and

FAILED: obj/electron/electron_lib/keyboard_util.o
clang++ -MD -MF [...]
../../electron/shell/common/keyboard_util.cc:19:30: error: constexpr function never produces a constant expression [-Winvalid-constexpr]
   19 | constexpr CodeAndShiftedChar KeyboardCodeFromKeyIdentifier(
      |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../electron/shell/common/keyboard_util.cc:111:33: note: non-constexpr function 'find' cannot be used in a constant expression
  111 |   if (auto* const iter = Lookup.find(str); iter != Lookup.end())
      |                                 ^
../../base/containers/flat_tree.h:310:18: note: declared here
  310 |   const_iterator find(const Key& key) const;
      |                  ^
1 error generated.

This is happening since staging has been merged into master, which included both a rustc and llvm bump.

Note that we inherit the llvm that rustc exposes.

This is not happening on release-24.11.

Will probably go to bed now and check the then hopefully successful build result tomorrow.

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:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 25.05 Release Notes (or backporting 24.11 and 25.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.

[emilylange]

@K900 looked into this when I was asleep and noticed another build error at the very end

[50281/50420] CXX obj/electron/electron_lib/keyboard_util.o

and fixed that as well :)

Thanks!

[teutat3s]

No resources to build electron atm, but leaving a LGTM here. Thanks for taking care of these fixes.

[K900]

Built locally on this exact commit.

[emilylange]

bit late, but for the sake of completeness:

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368966

---

x86_64-linux

✅ 7 packages built:

• electron_31
• feishin
• heroic
• heroic-unwrapped
• pocket-casts
• webcord-vencord
• zap-chip-gui