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

riot-desktop: fix missing tray icon #73054

Merged
merged 1 commit into from Nov 15, 2019
Merged

riot-desktop: fix missing tray icon #73054

merged 1 commit into from Nov 15, 2019

Conversation

layus
Copy link
Member

@layus layus commented Nov 8, 2019

The tray icon has always been missing for me (on sway / waybar).
It turns out that it is looked up in a different location than where we
package it.
Overall, it seems we are not at all following the upstream layout as can
be seen in data.tar.xz available at https://packages.riot.im/debian/pool/main/r/riot-web/riot-web_1.4.2_amd64.deb

This is a small fix that works for me. May not be optimal :-).

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 @pacien @worldofpeace

@ofborg ofborg bot requested review from worldofpeace and pacien November 8, 2019 16:09
@layus layus mentioned this pull request Nov 8, 2019
Closed
10 tasks
@bjornfor
Copy link
Contributor

The PR message has valuable info I'd like to see in the commit message.

@layus
riot-desktop: fix missing tray icon
aa3a8c6 
The tray icon has always been missing for me (on sway / waybar).
It turns out that it is looked up in a different location than where we package it.

Overall, it seems we are not at all following the upstream layout as can
be seen in data.tar.xz available at packages.riot.im/debian/pool/main/r/riot-web/riot-web_1.4.2_amd64.deb

This is a small fix that works for me. May not be optimal :-).
@layus
Copy link
Member Author

layus commented Nov 15, 2019

@bjornfor, @pacien Updated commit message :-)

@bjornfor bjornfor merged commit 9d10b20 into NixOS:master Nov 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@pacien pacien Awaiting requested review from pacien

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@layus @bjornfor