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

prismlauncher: support all openal binary backends #330394

Merged
merged 1 commit into from
Aug 11, 2024

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Jul 27, 2024

Description of changes

Previously we only included libpulseaudio in the wrapper, which limited the binary version of OpenAL provided by the launcher from using it's other backends. This also better documents what dependencies are for what part of lwjgl

Fixes #330154

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@getchoo getchoo marked this pull request as ready for review July 27, 2024 12:02
@ofborg ofborg bot requested review from Scrumplex and Minion3665 July 27, 2024 12:33
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 27, 2024
@getchoo getchoo force-pushed the pkgs/prismlauncher/openal branch from c86a86a to efe764c Compare August 7, 2024 03:17
@getchoo getchoo requested a review from Tungsten842 August 7, 2024 03:17
@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 7, 2024
@Scrumplex Scrumplex added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Aug 7, 2024
@Scrumplex
Copy link
Member

This has some conflicts with the master branch

Previously we only included `libpulseaudio` in the wrapper, which
limited the binary version of OpenAL provided by the launcher from using
it's other backends. This also better documents what dependencies are
for what part of lwjgl

Fixes NixOS#330154
@getchoo getchoo force-pushed the pkgs/prismlauncher/openal branch from efe764c to ae25abb Compare August 10, 2024 01:04
@getchoo getchoo requested a review from Scrumplex August 10, 2024 01:05
@getchoo getchoo removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Aug 10, 2024
@pbsds pbsds merged commit f7f9bcb into NixOS:master Aug 11, 2024
28 checks passed
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-330394-to-release-24.05 origin/release-24.05
cd .worktree/backport-330394-to-release-24.05
git switch --create backport-330394-to-release-24.05
git cherry-pick -x ae25abbadfa8f2958624f7e226fdc4f44034eba6

@pbsds
Copy link
Member

pbsds commented Aug 12, 2024

The backport seems very non-trivial, i'll leave it to @getchoo to decide whether the effort is worth it.

@getchoo getchoo deleted the pkgs/prismlauncher/openal branch August 13, 2024 00:59
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 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

prismlauncher: 1.20.5+ of minecraft (java 21) cannot locate libpipewire-0.3.so.0 (openal)
4 participants