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

maestral-gui: fix Qt5 version again #99589

Closed
wants to merge 1 commit into from

Conversation

@SFrijters
Copy link
Member

@SFrijters SFrijters commented Oct 4, 2020

Motivation for this change

This was incorrectly fixed (by me) in bc2e462.
As far as I can see, libsForQt5 defaults to libsForQt515 in top-level packages, but pyqt5 uses the libsForQt5 from the Python package set, which defaults to libsForQt514, so it needs to be set explicitly.
I'm not sure why it worked on my system before, but it now started failing after an update/rebuild.

This fix is very similar to other recent Python + Qt breakages.

Things done
  • 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 nixpkgs-review --run "nixpkgs-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.
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Oct 4, 2020

@jonringer Sorry, seems I broke this earlier - could you take a look at this fix / is my reasoning correct?

This was incorrectly fixed in bc2e462.
libsForQt5 defaults to libsForQt515 in top-level packages,
but pyqt5 uses the libsForQt5 from the Python package set, which
defaults to libsForQt514.
@SFrijters SFrijters force-pushed the SFrijters:maestral-qt5-fix branch from 4b3237c to f945124 Oct 5, 2020
@SFrijters SFrijters changed the title maestral-gui: Fix Qt5 version again maestral-gui: fix Qt5 version again Oct 5, 2020
@FRidh
Copy link
Member

@FRidh FRidh commented Oct 7, 2020

Please test #99956. If it not correct, we can change the Qt version for maestral-gui in that PR.

@FRidh FRidh mentioned this pull request Oct 7, 2020
99 of 186 tasks complete
@SFrijters
Copy link
Member Author

@SFrijters SFrijters commented Oct 7, 2020

Please test #99956. If it not correct, we can change the Qt version for maestral-gui in that PR.

@FRidh I've built maestral-gui using the PR - it seems to work just fine and the wrapper indeed contains the expected Qt 5.15 references.

@FRidh
Copy link
Member

@FRidh FRidh commented Oct 7, 2020

fixed with #99956

@FRidh FRidh closed this Oct 7, 2020
@FRidh
Copy link
Member

@FRidh FRidh commented Oct 7, 2020

thanks!

@SFrijters SFrijters deleted the SFrijters:maestral-qt5-fix branch Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.