Merge pull request #200241 from SuperSamus/cubeb

treewide: adjust cubeb dependencies

pkgs/applications/emulators/citra/generic.nix

@@ -17,7 +17,7 @@
 , enableQt ? true, qtbase, qtmultimedia, wrapQtAppsHook
 , enableQtTranslation ? enableQt, qttools
 , enableWebService ? true
-, enableCubeb ? true, libpulseaudio
+, enableCubeb ? true, cubeb
 , enableFfmpegAudioDecoder ? true
 , enableFfmpegVideoDumper ? true
 , ffmpeg_4
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals enableQt [ qtbase qtmultimedia ]
     ++ lib.optional enableSdl2 SDL2
     ++ lib.optional enableQtTranslation qttools
-    ++ lib.optional enableCubeb libpulseaudio
+    ++ lib.optionals enableCubeb cubeb.passthru.backendLibs
     ++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
     ++ lib.optional useDiscordRichPresence rapidjson
     ++ lib.optional enableFdk fdk_aac;
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   # Fixes https://github.com/NixOS/nixpkgs/issues/171173
   postInstall = lib.optionalString (enableCubeb && enableSdl2) ''
     wrapProgram "$out/bin/citra" \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]}
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath cubeb.passthru.backendLibs}
   '';
 
   meta = with lib; {

pkgs/applications/emulators/duckstation/default.nix

@@ -4,10 +4,10 @@
 , SDL2
 , cmake
 , copyDesktopItems
+, cubeb
 , curl
 , extra-cmake-modules
 , libXrandr
-, libpulseaudio
 , makeDesktopItem
 , mesa # for libgbm
 , ninja
@@ -48,7 +48,6 @@ stdenv.mkDerivation {
   buildInputs = [
     SDL2
     curl
-    libpulseaudio
     libXrandr
     mesa
     qtbase
@@ -58,7 +57,8 @@ stdenv.mkDerivation {
   ++ lib.optionals enableWayland [
     qtwayland
     wayland
-  ];
+  ]
+  ++ cubeb.passthru.backendLibs;
 
   cmakeFlags = [
     "-DUSE_DRMKMS=ON"
@@ -100,7 +100,7 @@ stdenv.mkDerivation {
   '';
 
   qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}"
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}"
   ];
 
   meta = with lib; {

pkgs/applications/emulators/pcsx2/default.nix

@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , lib
 , stdenv
+, cubeb
 , curl
 , ffmpeg
 , fmt
@@ -10,7 +11,6 @@
 , libaio
 , libbacktrace
 , libpcap
-, libpulseaudio
 , libsamplerate
 , libXrandr
 , libzip
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
     libaio
     libbacktrace
     libpcap
-    libpulseaudio
     libsamplerate
     libXrandr
     libzip
@@ -85,7 +84,8 @@ stdenv.mkDerivation rec {
     vulkan-loader
     wayland
     xz
-  ];
+  ]
+  ++ cubeb.passthru.backendLibs;
 
   installPhase = ''
     mkdir -p $out/bin
@@ -98,11 +98,10 @@ stdenv.mkDerivation rec {
   '';
 
   qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
+    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([
       ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
-      libpulseaudio
       vulkan-loader
-    ]}"
+    ] ++ cubeb.passthru.backendLibs)}"
   ];
 
   meta = with lib; {

pkgs/applications/emulators/rpcs3/default.nix

@@ -2,9 +2,8 @@
 , qtbase, qtquickcontrols, qtmultimedia, openal, glew, vulkan-headers, vulkan-loader, libpng
 , ffmpeg, libevdev, libusb1, zlib, curl, wolfssl, python3, pugixml, faudio, flatbuffers
 , sdl2Support ? true, SDL2
-, pulseaudioSupport ? true, libpulseaudio
+, cubebSupport ? true, cubeb
 , waylandSupport ? true, wayland
-, alsaSupport ? true, alsa-lib
 }:
 
 let
@@ -66,8 +65,7 @@ stdenv.mkDerivation {
     qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
     libevdev zlib libusb1 curl wolfssl python3 pugixml faudio flatbuffers
   ] ++ lib.optional sdl2Support SDL2
-    ++ lib.optional pulseaudioSupport libpulseaudio
-    ++ lib.optional alsaSupport alsa-lib
+    ++ lib.optionals cubebSupport cubeb.passthru.backendLibs
     ++ lib.optional waylandSupport wayland;
 
   postInstall = ''