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

Jump to bottom

calibre: fix build #66229

Merged
merged 1 commit into from Aug 7, 2019
Merged

calibre: fix build #66229

merged 1 commit into from Aug 7, 2019

Conversation

averelld
Copy link
Contributor

@averelld averelld commented Aug 6, 2019 •
edited

Motivation for this change

Makes calibre compile again, fixing #65313 No real testing done, but it starts again for me, and the viewer works.
Fix maybe technically uncool, splitting qtWrapperArgs, but i don't see how to get PYTHONPATH properly interpolated otherwise.

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.

cc @ToxicFrog

@lightbulbjim
Copy link
Contributor

Builds and runs for me on NixOS unstable.

@FRidh FRidh merged commit 514e62d into NixOS:master Aug 7, 2019
@averelld averelld deleted the fix-calibre-build branch August 7, 2019 13:52
@jonringer jonringer mentioned this pull request Aug 7, 2019
Closed
10 tasks
@worldofpeace
Copy link
Contributor

Why are we wrapping in installPhase?
I don't think the proper values would even be collected at that phase. It should be postFixup.

@averelld
Copy link
Contributor Author

averelld commented Aug 7, 2019

It's been wrapped there since initial packaging 10 years ago a4473b8, I'm assuming because https://github.com/kovidgoyal/calibre/tree/master/setup looks a bit extreme.
But 👍 on an overhaul, MAGICK_INC etc look unused as well.

@worldofpeace
Copy link
Contributor

I can fix this today 👍

@worldofpeace
Copy link
Contributor

Does it work without #65399 fix ?

Here it fails with

$ calibre
qt.qpa.plugin: Could not find the Qt platform plugin "xcb" in ""
This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

Aborted

I checked and it appears to be wrapped correctly, though I decided to make it a little cleaner #66483

@FRidh
Copy link
Member

FRidh commented Aug 11, 2019

Please do not use a custom builder function unless really necessary. I know it's documented as the way with Qt5, but we should avoid it when possible.

@worldofpeace
Copy link
Contributor

Please do not use a custom builder function unless really necessary. I know it's documented as the way with Qt5, but we should avoid it when possible.

Did you mean to comment that on my PR? (context confused)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lightbulbjim lightbulbjim lightbulbjim left review comments

@pSub pSub Awaiting requested review from pSub

@AndersonTorres AndersonTorres Awaiting requested review from AndersonTorres

@domenkozar domenkozar Awaiting requested review from domenkozar

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@averelld @lightbulbjim @worldofpeace @FRidh