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

retroarch: 1.8.1 -> 1.8.5 #82633

Merged
merged 8 commits into from Mar 22, 2020
Merged

retroarch: 1.8.1 -> 1.8.5 #82633

merged 8 commits into from Mar 22, 2020

Conversation

kolbycrouch
Copy link

@kolbycrouch kolbycrouch commented Mar 15, 2020 •
edited

Motivation for this change

Package is out of date, so are the optional core libraries.

Things done

Updated retroarch to 1.8.4
Updated all libretro cores.
Fixed broken libretro cores.
Fixed building on aarch64-linux ( Assumes desktop OpenGL ).
Added several missing libretro cores.

All cores should now build on x86_64-linux and aarch64-linux.

  • 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.

@kolbycrouch
Copy link
Author

I don't understand the check failure here.

matthewbauer
matthewbauer reviewed Mar 16, 2020
View reviewed changes
pkgs/misc/emulators/retroarch/default.nix
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {

enableParallelBuilding = true;

configureFlags = if stdenv.isLinux then [ "--enable-kms" ] else "";
configureFlags = stdenv.lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ];
Copy link
Member

Choose a reason for hiding this comment

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

Can you confirm that "egl" isn't detected by default? I thought in the past the configure script could guess it.

Copy link
Author

Choose a reason for hiding this comment

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

I thought that it didn't pick it up when I tested it on aarch64. Maybe it does though. I'm still afraid to change anything until I understand why the check is failing, if it matters.

@matthewbauer matthewbauer self-assigned this Mar 20, 2020
@matthewbauer
Revert " Fix init"
e1cab10 
This reverts commit e68a409.
@matthewbauer
retroarch: 1.8.4 -> 1.8.5
d513980
@matthewbauer
retroarch/cores.nix: cleanup
f094e13 
- Avoid using overrides unless necessary
- Set platform and ARCH by default
- Don’t set dontConfigure unless absolutely necessary
- Use preBuild instead of overriding entire configurePhase
@matthewbauer
Merge remote-tracking branch 'origin/master' into retroarch-update
293b16a
@matthewbauer matthewbauer changed the title retroarch: 1.8.1 -> 1.8.4 retroarch: 1.8.1 -> 1.8.5 Mar 22, 2020
matthewbauer
matthewbauer approved these changes Mar 22, 2020
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Looks good.

I have a few changes related to retroarch cores.nix that I have pushed. Mostly have nothing to do with your changes but make things a little less crazy with override logic.

@matthewbauer
Copy link
Member

I'll merge given this passes CI.

@matthewbauer
Copy link
Member

@GrahamcOfBorg build libretro

@matthewbauer
Copy link
Member

@GrahamcOfBorg eval

@matthewbauer
retroarch: remove macOS app support
a8a0cb1 
This is badly out of date so requires extra work to get working.

Anyway, you can still use it without the menu, with no problem.
@matthewbauer
retroarch/cores.nix: use correct license for gw
ed46adb 
This should be zlib the license, not zlib the package.
@matthewbauer matthewbauer merged commit 81d8415 into NixOS:master Mar 22, 2020
@kolbycrouch
Copy link
Author

kolbycrouch commented Mar 22, 2020 •
edited

Thanks for fixing this up for me. Although this broke picodrive on aarch64. I still don't understand the check failure from before. Might it have something to do with setting gw license to just zlib? Other than that I'm clueless.

@matthewbauer
Copy link
Member

Might it have something to do with setting gw license to just zlib?

Yeah - the license was being set to zlib the package, not zlib the license. Needed to add stdenv.lib.licenses to make it clear.

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

@MP2E MP2E Awaiting requested review from MP2E

@edwtjo edwtjo Awaiting requested review from edwtjo

@hrdinka hrdinka Awaiting requested review from hrdinka

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees

@matthewbauer matthewbauer

Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@kolbycrouch @matthewbauer @WayaOS