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

nheko: use qt5's mkDerivation #65787

Merged
merged 1 commit into from Aug 9, 2019
Merged

nheko: use qt5's mkDerivation #65787

merged 1 commit into from Aug 9, 2019

Conversation

rawkode
Copy link
Member

@rawkode rawkode commented Aug 2, 2019

Motivation for this change
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.
Notify maintainers

cc @

@ofborg ofborg bot requested review from Ekleog and fpletz August 2, 2019 13:30
@worldofpeace
Copy link
Contributor

cc #65399

worldofpeace
worldofpeace suggested changes Aug 2, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment

Choose a reason for hiding this comment

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

This isn't packaged properly according to the qt documentation in nixpkgs

https://hydra.nixos.org/build/96804884/download/1/nixpkgs/manual.html#sec-language-qt
Import mkDerivation and Qt (such as qtbase modules directly. Do not import Qt package sets; the Qt versions of dependencies may not be coherent, causing build and runtime failures.

It imports the qt package set qt5 and doesn't reference qtbase etc. directly.

Can you fix this @RawCode?

@rawkode
Copy link
Member Author

rawkode commented Aug 9, 2019

Sorry, missed this @worldofpeace; it's @rawkode with a K 😄

Updated as requested

@worldofpeace
Copy link
Contributor

worldofpeace commented Aug 9, 2019 •
edited

Sorry, missed this @worldofpeace; it's @rawkode with a K 😄

🤣 Sorry, GitHub suggestions can go awry sometimes.

worldofpeace
worldofpeace approved these changes Aug 9, 2019
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace left a comment •
edited

Choose a reason for hiding this comment

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

I can launch the executable from the result symlink, and I checked that it was wrapped.

Thanks for fixing this @rawkode ✨

@worldofpeace worldofpeace merged commit ededb06 into NixOS:master Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@Ekleog Ekleog Awaiting requested review from Ekleog

@fpletz fpletz Awaiting requested review from fpletz

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@rawkode @worldofpeace