wrapFirefox: handle binary wrappers#171985
Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom May 9, 2022
Merged
Conversation
vcunat
reviewed
May 7, 2022
We can't just edit binary wrappers in place because of a length mismatch, so we have to parse the generating makeCWrapper call out of the binary, extract wrapper arguments from it and add them to the Firefox wrapper. All these contortions are needed because Firefox looks for its runtime in argv0, so the proper argv0 needs to be set by wrappers to always point to the "final" runtime. I think this could be avoided by wrapping /lib/$libName/firefox instead of /bin/firefox, and I'd like to look into that in the future, but for now I'm just fixing the immediate problem.
ofborg
bot
added
10.rebuild-darwin: 0
vcunat
approved these changes
May 9, 2022
Member
vcunat
left a comment
vcunat
left a comment
There was a problem hiding this comment.
No truly in-depth review, but it seems OK, and we need at least some fix for now.
Member
Beware that |
This was referenced May 10, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #171497 (comment)
We can't just edit binary wrappers in place because of a length mismatch, so we have to parse the generating
makeCWrappercall out of the binary, extract wrapper arguments from it and add them to the Firefox wrapper.All these contortions are needed because Firefox looks for its runtime in argv0, so the proper argv0 needs to be set by wrappers to always point to the "final" runtime. I think this could be avoided by wrapping
/lib/$libName/firefoxinstead of/bin/firefox, and I'd like to look into that in the future, but for now I'm just fixing the immediate problem.Tested by running
firefox-binwith and withoutextraPrefs, both on staging-next and nixos-unstable.