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

dolphinEmuMaster: 20180430 -> 20180609 #41757

Closed
wants to merge 2 commits into from
Closed

dolphinEmuMaster: 20180430 -> 20180609 #41757

wants to merge 2 commits into from
+14 −10

Conversation

ghost
Copy link

@ghost ghost commented Jun 9, 2018 •
edited by ghost
Loading

Motivation for this change

Simple update.

On a side note, I can't seem to get the Vulkan backend working on this commit or the previous, is there anything special that needs to be done in the config or is this a dolphin/nixos problem?

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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@Madouura
dolphinEmuMaster: 20180430 -> 20180609

Verified

This commit was signed with the committer’s verified signature.
samsonasik Abdul Malik Ikhsan
GPG key ID: 69AC5BC354C89BE6
Verified
Learn about vigilant mode
fbd3cf1
@ghost
Copy link
Author

ghost commented Jun 9, 2018

Perhaps the vulkan-loader expression needs to be wrapped into one of the executables?

@ghost
Copy link
Author

ghost commented Jun 9, 2018

Turns out that's exactly what I had to do.
I'll submit another commit here shortly.

@Madouura
dolphinEmuMaster: Enable Vulkan

Verified

This commit was signed with the committer’s verified signature.
samsonasik Abdul Malik Ikhsan
GPG key ID: 69AC5BC354C89BE6
Verified
Learn about vigilant mode
3daa0db 
Dolphin did not have access to the Vulkan libs before, now it does.
@xeji
Copy link
Contributor

xeji commented Jun 10, 2018

@GrahamcOfBorg build dolphinEmuMaster

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: dolphinEmuMaster

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@xeji
Copy link
Contributor

xeji commented Jun 10, 2018

cc maintainer @MP2E

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: dolphinEmuMaster

Partial log (click to expand)

-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Resources/ro.lproj/dolphin-emu-wx.mo
-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Resources/hr.lproj
-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Resources/hr.lproj/dolphin-emu-wx.mo
-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Resources/ca.lproj
-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Resources/ca.lproj/dolphin-emu-wx.mo
-- Installing: /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609/Applications/DolphinWx.app/Contents/Info.plist
glibPreFixupPhase
post-installation fixup
strip is /nix/store/yyak5sjv68n9vdgnkd2cb5djk1l9sqj5-cctools-binutils-darwin/bin/strip
patching script interpreter paths in /nix/store/i57iq18brs8m4wgq4xlwj4cgd8wa0w2j-dolphin-emu-20180609

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: dolphinEmuMaster

Partial log (click to expand)

glibPreFixupPhase
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609
shrinking /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609/bin/.dolphin-emu-nogui-wrapped
shrinking /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609/bin/.dolphin-emu-wx-wrapped
gzipping man pages under /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609/share/man/
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609/bin
patching script interpreter paths in /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609
checking for references to /build in /nix/store/y9c00bjqrcpp6f2v3kblyxwb7vywvwn4-dolphin-emu-20180609...

@MP2E
Copy link

MP2E commented Jun 10, 2018

Looks good to me! Thank you for the contribution! Vulkan support was something I wasn't sure how to fix for some months now

Merged as of 45af94b

@MP2E MP2E closed this Jun 10, 2018
@ghost ghost deleted the update/dolphinEmuMaster branch June 11, 2018 03:08
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: 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
4 participants
@xeji @GrahamcOfBorg @MP2E @Madouura