firefox, thunderbird: enable wrapped derivations for darwin #377863
+89
−51
Conversation
This file contains 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
|
This currently crashes tabs for firefox; need to investigate, hence in draft. |
github-actions
bot
added
10.rebuild-darwin: 0
This was referenced Jan 30, 2025
booxter
commented
Jan 30, 2025
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
2 times, most recently
from
c246787 to
086fbec
Compare
6 tasks
booxter
commented
Jan 31, 2025
|
There are still some issues with permissions and desktopNames that contain spaces. |
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
086fbec to
460f143
Compare
|
13 tasks
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
4 times, most recently
from
de7f9fd to
fa0c455
Compare
github-actions
bot
added
10.rebuild-darwin: 11-100
10.rebuild-linux: 11-100
and removed
10.rebuild-darwin: 0
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
6f21e10 to
ea0ee33
Compare
ofborg
bot
removed
the
2.status: merge conflict
|
|
|
I believe it's an issue with the runner itself, not this PR. I will have to rebase to retrigger it. |
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
ea0ee33 to
ff86950
Compare
|
@mweinelt @lovesegfault would you mind reviewing this PR? Thank you. |
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
ff86950 to
07de93a
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
103ae49 to
cd92f32
Compare
|
|
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
cd92f32 to
a383af4
Compare
Related-Bug: NixOS#374354 Signed-off-by: Ihar Hrachyshka <[email protected]>
It's not implemented for Darwin. Signed-off-by: Ihar Hrachyshka <[email protected]>
It also aligns application names for wrapped and unwrapped flavors of the same derivations; and uses unique application names for each flavor, so it's now possible to install multiple versions on the same Darwin machine. One visible change now is that `About Firefox` window now shows: `Firefox for NixOS` instead of `Mozilla Firefox for NixOS` ...in the `distribution` field. I think it's fine and doesn't infringe on any trademarks because this field is not required to mention Mozilla at all, as per: https://wiki.mozilla.org/Distribution_INI_File While at it, also changed the branding for Darwin builds to list: `Firefox for Nix on MacOS` instead of `Firefox for NixOS` The telemetry and distribution ids (`nixos`) are left intact. Note: it's still not possible to install both source-based and -bin Darwin derivations in the same profile. It would require renaming applicationNames for these two different types to use unique names (e.g. `Firefox (Official)` or `Firefox (Binary)`, which doesn't seem optimal. Closes: NixOS#378433 Closes: NixOS#366581 Signed-off-by: Ihar Hrachyshka <[email protected]>
Signed-off-by: Ihar Hrachyshka <[email protected]>
Signed-off-by: Ihar Hrachyshka <[email protected]>
Without this, plugin-container fails to start. Signed-off-by: Ihar Hrachyshka <[email protected]>
booxter
force-pushed
the
firefox-wrapped-for-darwin
branch
from
a383af4 to
2c5b253
Compare
|
@jopejoe1 can I get some attention to this PR? It conflicts a lot with other PRs being merged, and it's not easy to rebuild everything affected by it locally to validate the patch doesn't break anything (for both platforms). We are talking about all Firefox derivatives plus Thunderbird flavors... Thanks in advance. |
|
|
jopejoe1
reviewed
Feb 24, 2025
Signed-off-by: Ihar Hrachyshka <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It also aligns application names for wrapped and unwrapped flavors of
the same derivations; and uses unique application names for each flavor,
so it's now possible to install multiple versions on the same Darwin
machine.
One visible change now is that
About Firefoxwindow now shows:Firefox for NixOSinstead ofMozilla Firefox for NixOS...in the
distributionfield. I think it's fine and doesn't infringeon any trademarks because this field is not required to mention Mozilla at
all, as per: https://wiki.mozilla.org/Distribution_INI_File
While at it, also changed the branding for Darwin builds to list:
Firefox for Nix on MacOSinstead ofFirefox for NixOSThe telemetry and distribution ids (
nixos) are left intact.Note: it's still not possible to install both source-based and -bin
Darwin derivations in the same profile. It would require renaming
applicationNames for these two different types to use unique names (e.g.
Firefox (Official)orFirefox (Binary), which doesn't seem optimal.Closes: #378433
Closes: #366581
In addition, the PR includes a patch to mark midori as broken because it is; and to mark firefoxpwa as linux only, because it's not currently implemented for Darwin.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.