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

moonlight-qt: 5.0.1 -> 6.0.1, and other enhancements #319743

Merged
merged 8 commits into from
Jul 4, 2024

Conversation

azuwis
Copy link
Contributor

@azuwis azuwis commented Jun 14, 2024

Description of changes

Replace #318940

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

fetchpatch,
darwin,
overrideSDK,
libsForQt5,
Copy link
Member

Choose a reason for hiding this comment

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

It seems that they ship with qt6 by default almost everywhere, can we use it as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've tried qt6, but encounter the same problem as https://github.com/NixOS/nixpkgs/pull/252446/checks?check_run_id=18159712763

It seems qmake look for the wrong path for qmlcachegen.

Copy link
Member

Choose a reason for hiding this comment

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

That's an upstream issue most likely

Copy link
Contributor

@cgutman cgutman Jul 4, 2024

Choose a reason for hiding this comment

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

If you mean moonlight-qt upstream, we're not really doing anything special other than asking for precompiled QML files using the documented CONFIG option. https://github.com/moonlight-stream/moonlight-qt/blob/17a25484805ef927ad7c1b2906f885ee26eda928/app/app.pro#L13-L20

However, the QML precompilation is probably undesirable in the case of CONFIG+=disable-prebuilts since that is asking explicitly for Moonlight not to internally bundle all of our dependencies. Using precompiled QML without bundling Qt could lead to the precompiled qmlc files being useless if the compile-time Qt version doesn't exactly match the runtime Qt version. I've checked in a patch to avoid this scenario, which may also allow you to migrate Moonlight to Qt 6 in NixOS.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cgutman I was wondering why the problem exists on darwin but not linux, thanks for the explanation.

The fix/workaround is to disable qtquickcompiler qmake flag.

I've made a PR for qt6 with this patch #324703.

@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/4137

@azuwis azuwis changed the title moonlight-qt: 5.0.1 -> 6.0.0, and other enhancements moonlight-qt: 5.0.1 -> 6.0.1, and other enhancements Jul 1, 2024
@zmitchell
Copy link
Contributor

Thanks for picking up where I left off!

@zmitchell
Copy link
Contributor

@azuwis I think you still need to run tests and fill out the rest of the PR template for this to proceed

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/intel-video-acceleration-changes-going-from-23-11-24-05/48377/12

@SuperSandro2000 SuperSandro2000 merged commit ff38961 into NixOS:master Jul 4, 2024
30 checks passed
@azuwis azuwis deleted the moonlight-qt branch July 5, 2024 01:24
@azuwis azuwis mentioned this pull request Jul 5, 2024
13 tasks
@wegank wegank mentioned this pull request Jul 6, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants