From ae25abbadfa8f2958624f7e226fdc4f44034eba6 Mon Sep 17 00:00:00 2001 From: seth Date: Sat, 27 Jul 2024 07:57:09 -0400 Subject: [PATCH] prismlauncher: support all openal binary backends 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 https://github.com/NixOS/nixpkgs/issues/330154 --- pkgs/by-name/pr/prismlauncher/package.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/pr/prismlauncher/package.nix b/pkgs/by-name/pr/prismlauncher/package.nix index 27b66966d42ee..bb08a19de3704 100644 --- a/pkgs/by-name/pr/prismlauncher/package.nix +++ b/pkgs/by-name/pr/prismlauncher/package.nix @@ -4,6 +4,7 @@ symlinkJoin, prismlauncher-unwrapped, addDriverRunpath, + alsa-lib, flite, gamemode, glfw, @@ -14,11 +15,13 @@ jdk21, kdePackages, libGL, + libjack2, libpulseaudio, libusb1, makeWrapper, openal, pciutils, + pipewire, udev, vulkan-loader, xorg, @@ -102,21 +105,28 @@ symlinkJoin { runtimeLibs = [ # lwjgl + stdenv.cc.cc.lib + ## native versions glfw - libpulseaudio - libGL openal - stdenv.cc.cc.lib - vulkan-loader # VulkanMod's lwjgl - - udev # oshi + ## openal + alsa-lib + libjack2 + libpulseaudio + pipewire + ## glfw + libGL xorg.libX11 xorg.libXext xorg.libXcursor xorg.libXrandr xorg.libXxf86vm + + udev # oshi + + vulkan-loader # VulkanMod's lwjgl ] ++ lib.optional textToSpeechSupport flite ++ lib.optional gamemodeSupport gamemode.lib