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

sunshine: resolve tray icon issues #364438

Merged
merged 3 commits into from
Dec 19, 2024
Merged

sunshine: resolve tray icon issues #364438

merged 3 commits into from
Dec 19, 2024

Conversation

devusb
Copy link
Contributor

@devusb devusb commented Dec 12, 2024 •
edited
Loading

Closes #361790

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@devusb devusb mentioned this pull request Dec 12, 2024
Closed
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Dec 12, 2024
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Dec 15, 2024
@github-actions github-actions bot added 8.has: module (update) This PR changes an existing module in `nixos/` and removed 10.rebuild-linux: 1 labels Dec 17, 2024
@devusb devusb mentioned this pull request Dec 17, 2024
Closed
13 tasks
devusb and others added 2 commits December 16, 2024 18:43
@devusb
sunshine: fix tray icon and menu links
f626276
@ghpzin @devusb
nixos/tests/sunshine: fix test
46abca2 
- change text in `wait_for_console_text` to prevent sending curl with
pairing response before moonlight can accept it
- remove "close moonlight" step as next window stays on top in
fullscreen, previous window with pairing result does not interfere
with test. Otherwise it needs OCR or some other way to only do
`send_key("kp_enter")` after "Pairing complete" window is visible.
- add different ways to increase chances of successfull OCR: hide icewm
panel, gxmessage window takes full screen without titlebar or buttons,
black background, white foreground, consolas font,"ABC" text
- add `wait_for_console_text` to only run OCR after window is visible
@devusb devusb marked this pull request as ready for review December 17, 2024 01:47
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4978

@thiagokokada
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 364438

x86_64-linux

⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
✅ 1 package built:
  • sunshine

@thiagokokada thiagokokada merged commit 8369379 into NixOS:master Dec 19, 2024
52 of 53 checks passed
@devusb devusb deleted the sunshine-tray branch December 19, 2024 20:52
@paparodeo
Copy link
Contributor

this breaks in staging / staging-next as boost-185 is removed.

https://github.com/NixOS/nixpkgs/actions/runs/12423664740/job/34687593476

   error: undefined variable 'boost185'
   at /nix/store/z8w9nr9lsis5c8ayr1dc81cyg2r2qx2q-source/pkgs/top-level/all-packages.nix:18715:13:
    18714|   sunshine = callPackage ../by-name/su/sunshine/package.nix {
    18715|     boost = boost185;
         |             ^
    18716|   };

this will need to be moved to boost186 or some other boost version or reverted

@paparodeo
Copy link
Contributor

can sunshine just use boost-186?

@devusb
Copy link
Contributor Author

devusb commented Dec 20, 2024

haven’t tried, but it may need this LizardByte/Sunshine#3256

@paparodeo
Copy link
Contributor

can sunshine just use boost-186?

haven’t tried, but it may need this LizardByte/Sunshine#3256

yeah, doesn't build by default and that patch doesn't apply to the current sources in nixpkgs.

@devusb
Copy link
Contributor Author

devusb commented Dec 20, 2024

if 186 is the new default the reverting won’t help either I don’t think.

@paparodeo
Copy link
Contributor

if 186 is the new default the reverting won’t help either I don’t think.

reverting will fix the CI but sunshine will still be broken.

@paparodeo
Copy link
Contributor

the patch doesn't look too complex might be easy enough to fix.

@devusb
Copy link
Contributor Author

devusb commented Dec 20, 2024

yeah fair — we may need to consider switching to an unstable version in the meantime.

@paparodeo
Copy link
Contributor

yeah fair — we may need to consider switching to an unstable version in the meantime.

I ported the patch hand have it building on staging-next. will post PR

@paparodeo paparodeo mentioned this pull request Dec 20, 2024
Merged
13 tasks
@paparodeo
Copy link
Contributor

yeah fair — we may need to consider switching to an unstable version in the meantime.

I ported the patch hand have it building on staging-next. will post PR

#366696

@niklaskorz niklaskorz mentioned this pull request Jan 21, 2025
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thiagokokada thiagokokada thiagokokada approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Sunshine module - tray icon not loading and apps.json created as read-only.
5 participants
@devusb @nixos-discourse @thiagokokada @paparodeo @ghpzin