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

electron-bin: don't wrap inside libexec #384865

Merged
merged 1 commit into from
Mar 1, 2025
Merged

Conversation

TomaSajt
Copy link
Contributor

@TomaSajt TomaSajt commented Feb 24, 2025

Closes #384854

I am not sure what chrome-sandbox and chrome_crashpad_handler are doing, hopefully they don't actually need to be wrapped.

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/)
  • 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.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Feb 24, 2025
@nix-owners nix-owners bot requested review from teutat3s and yayayayaka February 24, 2025 21:05
@TomaSajt TomaSajt requested a review from emilylange February 24, 2025 21:20
@booxter
Copy link
Contributor

booxter commented Feb 28, 2025

AFAIU this wrapping hack is not needed once we bump electron as in: #385597 Then we can safely remove it.

@TomaSajt
Copy link
Contributor Author

We still need to wrap gapps, no?

@booxter
Copy link
Contributor

booxter commented Feb 28, 2025

Oh you are right, I misread the original patch.

I think this is good. One minor comment is that you don't need to ln -s for /bin/electron (nor mkdir -p $out/bin) in the installPhase, so these can be cleaned up.

@booxter
Copy link
Contributor

booxter commented Feb 28, 2025

One question I still don't have an answer to is: with this PR, the /libexec/ electron binary will not be wrapped to fix the 16k issue. AFAIU the /libexec binary is the one that is used to build other apps. Does it mean that all apps that use electron-dist binary will again be affected by the 16k issue (until electron is upgraded)? Are we regressing here?

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Feb 28, 2025
@TomaSajt
Copy link
Contributor Author

When packaging an electron based app on linux, we immediately remove the electron that's copied into the package and re-wrap the app using the ${electron}/bin/electron binary.

So, no, currently it won't do anything to impact users.

@booxter booxter mentioned this pull request Mar 1, 2025
13 tasks
@drupol drupol merged commit 54b7b07 into NixOS:master Mar 1, 2025
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

electron-bin: using makeWrapper breaks fuse logic
4 participants