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.

Sign up for GitHub

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

Jump to bottom

wire-desktop: fix a segfault when changing profile picture #74472

Merged
merged 1 commit into from Nov 28, 2019
Merged

wire-desktop: fix a segfault when changing profile picture #74472

merged 1 commit into from Nov 28, 2019

Conversation

Kiwi
Copy link
Member

@Kiwi Kiwi commented Nov 28, 2019

(wire-desktop:11531): GLib-GIO-ERROR **: 06:04:45.248: No GSettings schemas are installed on the system

and fix Fontconfig warning: "/etc/fonts/fonts.conf", line 86: unknown element "blank"

and tidied up the linux build greatly

and added kiwi as a maintainer

Motivation for this change

@worldofpeace made me try wire-desktop and it crashed when I tried to change my profile picture. So I thought I'd be nice and fix their package for once since they always help me with mine. :P

Things done

A while back @worldofpeace helped me package Simplenote and after my first miserable attempt they pointed me at wire-desktop for a better reference than the one I used. While trying to get their way to work we learned of an even easier/cleaner way to do these electron apps. It just so happens that switching to that method fixed the segfault. ;)

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @worldofpeace

@ofborg ofborg bot requested review from worldofpeace and toonn November 28, 2019 12:09
worldofpeace
worldofpeace reviewed Nov 28, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix Outdated
postFixup = ''
makeWrapper $out/opt/Wire/wire-desktop $out/bin/wire-desktop \
"''${gappsWrapperArgs[@]}" \
--set FONTCONFIG_FILE "${fontconfig.out}/etc/fonts/fonts.conf"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the error there is a harmless one, fontconfig in nixos will just use a different conf.
This will also force it to not use the font conf of the system.

Copy link
Member Author

Choose a reason for hiding this comment

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

It seems to have fixed itself

worldofpeace
worldofpeace suggested changes Nov 28, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

we should do https://github.com/NixOS/nixpkgs/pull/74472/files#r351812282, and then I think it's good.

@ofborg ofborg bot requested a review from worldofpeace November 28, 2019 15:58
@Kiwi
wire-desktop: fix a segfault when changing profile picture
5a465b0 
(wire-desktop:11531): GLib-GIO-ERROR **: 06:04:45.248: No GSettings schemas are installed on the system

and fix Fontconfig warning: "/etc/fonts/fonts.conf", line 86: unknown element "blank"

and tidied up the linux build greatly

and added kiwi as a maintainer
worldofpeace
worldofpeace approved these changes Nov 28, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

LGTM, thanks a lot.

@worldofpeace worldofpeace merged commit fb4ce49 into NixOS:master Nov 28, 2019
@Kiwi Kiwi deleted the wire-desktop-segfault-fix branch November 28, 2019 17:40
toonn
toonn reviewed Nov 28, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
};

darwin = stdenv.mkDerivation {
inherit pname version meta;

src = fetchurl {
url = "https://github.com/wireapp/wire-desktop/releases/download/"
+ "macos%2F${version}/Wire.pkg";
Copy link
Contributor

Choose a reason for hiding this comment

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

What's the reasoning behind this unindent? It makes for much more confusing formatting imo.

toonn
toonn reviewed Nov 28, 2019
View reviewed changes
pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
in if stdenv.isDarwin
then darwin
else linux
in
Copy link
Contributor

Choose a reason for hiding this comment

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

This is another questionable formatting change. It's less clear that the conditional expression is in the body of the let in. What's the motivation for this?

I personally don't like the non-indented then/else clauses, this is not a statement but an expression, the extra indentation makes it much clearer the clauses are part of an expression.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@toonn toonn toonn left review comments

@worldofpeace worldofpeace worldofpeace approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Kiwi @toonn @worldofpeace