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

pcsx2: unstable-2020-01-05 -> 1.6.0-rc #85679

Merged
merged 1 commit into from Apr 22, 2020
Merged

pcsx2: unstable-2020-01-05 -> 1.6.0-rc #85679

merged 1 commit into from Apr 22, 2020

Conversation

Omoroca13
Copy link
Contributor

Motivation for this change

#74132

#75413
Was not usable for me so I looked around.

This fixes the build for me and is actually usable.
I only tested this via overlay.

Patches from:
PCSX2/pcsx2#2669
PCSX2/pcsx2@e8ed18f

As i am pretty much a git + github noob sry if something is wrong.

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.

@Omoroca13
Copy link
Contributor Author

ping last commiter @aanderse
ping maintainer @hrdinka

@ofborg ofborg bot requested a review from hrdinka April 21, 2020 13:21
@jtojnar jtojnar changed the title pcsx2 unstable-2020-01-05 -> 1.4.0 Partial revert of "pcsx2: 1.4.0 -> unstable-2020-01-05" Apr 22, 2020
jtojnar
jtojnar reviewed Apr 22, 2020
View reviewed changes
pkgs/misc/emulators/pcsx2/default.nix Outdated
# cherrypicked from
# https://github.com/PCSX2/pcsx2/issues/2669
# https://github.com/PCSX2/pcsx2/commit/e8ed18febaa046a3383a4b960517372a5bc554d1
./gcc8.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

Does fetchpatch not work?

@jtojnar
Copy link
Contributor

jtojnar commented Apr 22, 2020

Maybe the 1.6.0 release candidate would fix your issues? But if the build fix is the only thing the bump did, maybe downgrade is acceptable.

@Omoroca13 Omoroca13 force-pushed the pcsx2 branch 2 times, most recently from e013973 to 89066e1 Compare April 22, 2020 06:57
@Omoroca13
Copy link
Contributor Author

The first patch was done by me (badly probably) based on the patch and conversation in the pcsx2 github.
I found a patch in the archlinux repo which is probably a better choice.
https://git.archlinux.org/svntogit/community.git/tree/trunk?h=packages/pcsx2
Compiles and works for me.

@Mic92
Copy link
Member

Mic92 commented Apr 22, 2020

@GrahamcOfBorg build pcsx2

@hrdinka
Copy link
Contributor

hrdinka commented Apr 22, 2020

I have just built and started up the current version of PCSX2 and it does work for me. Make sure to close the log window, the UI is very unresponsive when it is open (same with previous versions). It does also fully honor my GTK theme, maybe you have only set one for GTK3 but not GTK2?

Does 1.4 solve your problems? I would also be in favor of switching to 1.6.0-rc instead of the downgrade, as the upgrade was done to come by other problems.

@Omoroca13
Copy link
Contributor Author

On the current version the gui doesnt work for me at all.
I just tried 1.6.0-rc which works fine.

@Omoroca13 Omoroca13 changed the title Partial revert of "pcsx2: 1.4.0 -> unstable-2020-01-05" pcsx2: unstable-2020-01-05 -> 1.6.0-rc Apr 22, 2020
@Omoroca13
Copy link
Contributor Author

My bad about the noise i thought stable would be preferable so i didnt test the release candidate.

@hrdinka hrdinka merged commit 63acac6 into NixOS:master Apr 22, 2020
@hrdinka
Copy link
Contributor

hrdinka commented Apr 22, 2020

This one works for me as well. Thanks for the patch 👍

@Omoroca13 Omoroca13 deleted the pcsx2 branch April 27, 2020 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar left review comments

@hrdinka hrdinka Awaiting requested review from hrdinka

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Omoroca13 @jtojnar @Mic92 @hrdinka @Janik-Haag