Skip to content

Comments

maestral-gui: fix Qt5 version again#99589

Closed
SFrijters wants to merge 1 commit intoNixOS:masterfrom
SFrijters:maestral-qt5-fix
Closed

maestral-gui: fix Qt5 version again#99589
SFrijters wants to merge 1 commit intoNixOS:masterfrom
SFrijters:maestral-qt5-fix

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 commented Oct 4, 2020

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

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Oct 4, 2020
@SFrijters
maestral-gui: fix Qt5 version again
f945124 
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 changed the title maestral-gui: Fix Qt5 version again maestral-gui: fix Qt5 version again Oct 5, 2020
@FRidh
Copy link
Member

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
Merged
@SFrijters
Copy link
Member Author

SFrijters commented Oct 7, 2020 •
edited
Loading

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 commented Oct 7, 2020

fixed with #99956

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

FRidh commented Oct 7, 2020

thanks!

@SFrijters SFrijters deleted the maestral-qt5-fix branch October 18, 2020 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@SFrijters @FRidh