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

Thunderbird: Fix default mail client detection #24961

Merged
merged 2 commits into from Apr 23, 2017

Conversation

layus
Copy link
Member

@layus layus commented Apr 16, 2017

Motivation for this change

fix regression from b023370, and default mail reader detection (see also #23516)

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

/cc @abbradar

The refactoring in b023370 ported
changes from firefox-unwrpped, but dropped features in firefox's
wrapper.

Add the desktop item and remove useless dev files.
@mention-bot
Copy link

@layus, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vcunat, @FRidh and @abbradar to be potential reviewers.

@layus layus force-pushed the thunderbird-default-mail-client branch from 89bcc49 to c11c9ff Compare April 16, 2017 22:25
@layus
Copy link
Member Author

layus commented Apr 17, 2017

Ooops, found a bug in the meantime. it would be simpler to enforce gtk3 to get only one build to test.

@layus layus changed the title Thunderbird: Fix default mail client detection [WIP] Thunderbird: Fix default mail client detection Apr 17, 2017
@layus layus force-pushed the thunderbird-default-mail-client branch from c11c9ff to ac34cc1 Compare April 17, 2017 19:44
@layus
Copy link
Member Author

layus commented Apr 17, 2017

Voilà, I got it working properly. This is difficult because we need to use wrapGAppsHook when gtk3 is enabled, and makeWrapper otherwise...

@abbradar Would you mind reviewing this ?

@layus layus changed the title [WIP] Thunderbird: Fix default mail client detection Thunderbird: Fix default mail client detection Apr 17, 2017
@layus layus force-pushed the thunderbird-default-mail-client branch from ac34cc1 to eb8f604 Compare April 17, 2017 20:03
Copy link
Member

@abbradar abbradar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the bird's view the fix seems hacky to me. However this may very well be the best way to do this and I have a very little time to confirm. So, unless I'll have some in several days I'm okay with this merged as is.

@layus
Copy link
Member Author

layus commented Apr 18, 2017

It is hacky because

  1. we do not want to use wrapProgram (which wrapGAppsHook uses), because it would wrap a symlink, leading to one extra useless resolve step.
  2. it allows to factorize the code for gtk3 & wrapGAppsHook and gtk2 (without the hook) into one execution flow.

@abbradar
Copy link
Member

Tested; it works for me. Thanks for this and for restoring features which I accidentially removed!

@abbradar abbradar merged commit 9f6baaa into NixOS:master Apr 23, 2017
@layus
Copy link
Member Author

layus commented Apr 23, 2017

Thanks for reviewing :-).

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.

None yet

3 participants