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.

Sign up for GitHub

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

dolphin-emu fixes and updates #67235

Merged
merged 7 commits into from
Aug 23, 2019
Merged

dolphin-emu fixes and updates #67235

merged 7 commits into from
Aug 23, 2019
+50 −35

Conversation

ashkitten
Copy link
Contributor

Motivation for this change
  • dolphinEmu was broken, fixed building with soundtouch-2.1.2
  • both dolphinEmu and dolphinEmuMaster were broken at runtime (see Tracking issue for wrapQtAppsHook #65399)
  • replaced instances of stdenv.lib with lib for readability
  • added self as co-maintainer
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 @MP2E

Sorry, something went wrong.

worldofpeace
worldofpeace suggested changes Aug 22, 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.

Thanks, I've left some comments. Main concern is with dolphinEmuMaster and the qt wrapper.

MP2E
MP2E suggested changes Aug 22, 2019
View reviewed changes
@ofborg ofborg bot requested a review from MP2E August 22, 2019 07:24
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Aug 22, 2019
@ashkitten ashkitten force-pushed the update-dolphin branch 3 times, most recently from 71ce134 to 88df332 Compare August 22, 2019 18:18
@ashkitten
Copy link
Contributor Author

addressed all requested changes

worldofpeace
worldofpeace approved these changes Aug 22, 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.

I could start all the executable in both packages.

Verified dolphinEmuMaster is wrapped.

@ashkitten
dolphinEmu: fix build
91997f8
@ashkitten
dolphinEmuMaster: use wrapQtAppsHook
29fef57
@ashkitten
dolphinEmu: use lib instead of stdenv.lib
9e8a56d
@ashkitten
dolphinEmuMaster: use lib instead of stdenv.lib

Verified

This commit was signed with the committer’s verified signature.
UlisesGascon Ulises Gascón
GPG key ID: 04CD3F2FDE079578
Verified
Learn about vigilant mode
6dd7a12
@ashkitten
maintainers: add ashkitten
bf3e16e
@ashkitten
dolphinEmuMaster: add ashkitten as maintainer

Verified

This commit was signed with the committer’s verified signature.
ruyadorno Ruy Adorno
GPG key ID: E7DC4C5493C3DB5F
Verified
Learn about vigilant mode
232169f
@ashkitten
dolphinEmuMaster: update to latest upstream

Verified

This commit was signed with the committer’s verified signature.
ruyadorno Ruy Adorno
GPG key ID: E7DC4C5493C3DB5F
Verified
Learn about vigilant mode
c793e0a
@MP2E MP2E merged commit fe9e185 into NixOS:master Aug 23, 2019
@MP2E
Copy link

MP2E commented Aug 23, 2019

Looks good to me, merged. Thank you for the PR!

@aanderse
Copy link
Member

Thank you very much @ashkitten ❤️

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

@MP2E MP2E

@worldofpeace worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ashkitten @MP2E @aanderse @worldofpeace