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

rpcs3: 0.0.12 -> 0.0.16 #122140

Merged
merged 1 commit into from
May 14, 2021
Merged

rpcs3: 0.0.12 -> 0.0.16 #122140

merged 1 commit into from
May 14, 2021

Conversation

vs49688
Copy link
Contributor

@vs49688 vs49688 commented May 8, 2021

Motivation for this change

Updating

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.

@ofborg ofborg bot requested review from abbradar and ilian May 8, 2021 01:34
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels May 8, 2021
@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 122140 at 65f95573 run on x86_64-linux 1

1 package built successfully:
  • rpcs3
1 suggestion:
  • warning: unclear-gpl

    gpl2 is a deprecated license, please check if project uses gpl2Plus or gpl2Only and change meta.license accordingly.

    Near pkgs/misc/emulators/rpcs3/default.nix:51:5:

       |
    51 |     license = licenses.gpl2;
       |     ^
    

@vs49688 vs49688 force-pushed the rpcs3 branch 2 times, most recently from 02190b8 to e39a74b Compare May 8, 2021 09:14
@ilian
Copy link
Member

ilian commented May 8, 2021

I wasn't able to derive the GPL license type of RPCS3 so I added an upstream issue for the authors to clarify: RPCS3/rpcs3#10255

@vs49688
Copy link
Contributor Author

vs49688 commented May 8, 2021

I just grepped for "any later version", which most of the files seemed to have, hence gpl2Plus.

@ilian
Copy link
Member

ilian commented May 8, 2021

I just grepped for "any later version", which most of the files seemed to have, hence gpl2Plus.

The only files that matched that pattern are external libraries (e.g. those listed under /Crypto) instead of the source files of the authors.

@vs49688
Copy link
Contributor Author

vs49688 commented May 8, 2021

Fair enough, I only changed it because of:

Result of nixpkgs-review pr 122140 at 65f9557 run on x86_64-linux 1
1 package built successfully:
1 suggestion:

I can force-push a new one without the license change for now, if that'd be better.

@ilian
Copy link
Member

ilian commented May 8, 2021

Fair enough, I only changed it because of:

Result of nixpkgs-review pr 122140 at 65f9557 run on x86_64-linux 1
1 package built successfully:
1 suggestion:

I can force-push a new one without the license change for now, if that'd be better.

Sounds good! We can change the license as soon as the linked upstream issue is resolved.

By the way, since we are fetching the source from GitHub, I suggest that we use fetchFromGitHub to fetch the source files:

  src = fetchFromGitHub {
    owner = "RPCS3";
    repo = "rpcs3";
    rev = "v${majorVersion}";
    fetchSubmodules = true;
    sha256 = "qceUt3TnzqpK+Ur5DrQ1/g97RJGdynISAcuVJ0KD1Nk=";
  };

@vs49688
Copy link
Contributor Author

vs49688 commented May 8, 2021

Done, however I realised that I didn't update the hash so it was still building the older one. It's building on my machine now, but it's not particularly fast...

EDIT: It builds fine. Qt doesn't like dark themes though:
image

@ofborg ofborg bot requested a review from ilian May 9, 2021 01:50
@vs49688
Copy link
Contributor Author

vs49688 commented May 9, 2021

By the way, there's been a response on the license: RPCS3/rpcs3#10255 (comment)
Seems the project as a whole is gpl2Only, so should we go with that?

Also this RPCS3/rpcs3#10255 (comment) concerns me... Should I switch to master (RPCS3/rpcs3@31b55e0 at time of writing) or stay with the tag?

@ilian
Copy link
Member

ilian commented May 9, 2021

By the way, there's been a response on the license: RPCS3/rpcs3#10255 (comment)
Seems the project as a whole is gpl2Only, so should we go with that?

Sounds good!

Also this RPCS3/rpcs3#10255 (comment) concerns me... Should I switch to master (RPCS3/rpcs3@31b55e0 at time of writing) or stay with the tag?

Yes, we should probably switch to master.

Additionally:
* Use system libcurl, so the patch downloader can work
* Use system zlib
* Use system libusb
* Add note about using system WolfSSL
* Enable SDL2, so the FAudio backend can work
* Change license to gpl2Only, as per [1]

[1]: RPCS3/rpcs3#10255 (comment)
@ofborg ofborg bot requested a review from ilian May 11, 2021 03:37
@vs49688
Copy link
Contributor Author

vs49688 commented May 11, 2021

I've just de-vendor'd zlib, libusb, and llvm. If that's enough, I'll squash and force-push.

pkgs/misc/emulators/rpcs3/default.nix Outdated Show resolved Hide resolved
@ofborg ofborg bot requested a review from ilian May 11, 2021 11:19
@vs49688 vs49688 requested a review from SuperSandro2000 May 12, 2021 12:14
@vs49688
Copy link
Contributor Author

vs49688 commented May 14, 2021

Ping? I would really like this to be 21.05

@vs49688 vs49688 mentioned this pull request May 14, 2021
@AndersonTorres AndersonTorres merged commit 5d4a430 into NixOS:master May 14, 2021
@vs49688 vs49688 deleted the rpcs3 branch August 21, 2021 06:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants