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

ppsspp: add SDL and headless #186441

Merged
merged 1 commit into from
Aug 15, 2022
Merged

ppsspp: add SDL and headless #186441

merged 1 commit into from
Aug 15, 2022

Conversation

SamLukeYes
Copy link
Member

@SamLukeYes SamLukeYes commented Aug 13, 2022

Change the default ppsspp package to SDL front end, as it supports
Vulkan, and is allowed to build the headless binary together.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 13, 2022
@ofborg ofborg bot requested a review from AndersonTorres August 13, 2022 12:47
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Aug 13, 2022
ppsspp-sdl-wayland = callPackage ../applications/emulators/ppsspp {
pname = "ppsspp-sdl-wayland";
forceWayland = true;
enableVulkan = false; # https://github.com/hrydgard/ppsspp/issues/13845
Copy link
Member

Choose a reason for hiding this comment

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

It is preferrable to put such a documentation inside the expression.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 14, 2022
Copy link
Contributor

@jian-lin jian-lin left a comment

Choose a reason for hiding this comment

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

The relations between newly added parameters (enableVulkan, enableHeadless and forceWayland) are a bit confusing, could you try to:

  • remove uneeded ones, e.g. removing enableHeadless and enabling it if possible
  • and add assert to make sure these arguments are valid?

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 14, 2022
Change the default ppsspp package to SDL frontend, as it supports
vulkan, and is allowed to build the headless binary together.
mkdir -p $out/share/{applications,ppsspp}
'' + (if enableQt then ''
install -Dm555 PPSSPPQt $out/bin/ppsspp
wrapProgram $out/bin/ppsspp \
Copy link
Member

Choose a reason for hiding this comment

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

What are the parameters of this wrapping?

Copy link
Member Author

Choose a reason for hiding this comment

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

In case enableVulkan is overridden to be true, it would be wrapped with --prefix LD_LIBRARY_PATH : ${vulkanPath}. This should allow the Qt front end to detect Vulkan, though not able to use it for now.

Copy link
Member

Choose a reason for hiding this comment

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

Ugly as hell.

@AndersonTorres AndersonTorres merged commit 0442e40 into NixOS:master Aug 15, 2022
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
@SamLukeYes SamLukeYes deleted the ppsspp branch August 15, 2024 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants