pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #171955 from SuperSamus/emu-cubeb

{citra,duckstation}: fix Cubeb under SDL interface

authored by Anderson Torres and committed by GitHub f8a27ed6 92ca7cf0

+7 -6
unified split
+5 -3
pkgs/applications/emulators/citra/default.nix
··· 77 chmod -R a+w externals/zstd 78 ''; 79 80 - # Todo: cubeb audio backend (the default one) doesn't work on the SDL interface. 81 - # This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation). 82 - # Note that the two interfaces have two separate configuration files. 83 84 meta = with lib; { 85 homepage = "https://citra-emu.org";
··· 77 chmod -R a+w externals/zstd 78 ''; 79 80 + # Fixes https://github.com/NixOS/nixpkgs/issues/171173 81 + postInstall = lib.optionalString (enableCubeb && enableSdl2) '' 82 + wrapProgram "$out/bin/citra" \ 83 + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} 84 + ''; 85 86 meta = with lib; { 87 homepage = "https://citra-emu.org";
+2 -3
pkgs/applications/emulators/duckstation/default.nix
··· 90 runHook postCheck 91 ''; 92 93 qtWrapperArgs = [ 94 - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" 95 ]; 96 97 meta = with lib; { ··· 102 platforms = platforms.linux; 103 }; 104 } 105 - # TODO: default sound backend (cubeb) does not work, but SDL does. Strangely, 106 - # switching to cubeb while a game is running makes it work.
··· 90 runHook postCheck 91 ''; 92 93 + # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 94 qtWrapperArgs = [ 95 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" 96 ]; 97 98 meta = with lib; { ··· 103 platforms = platforms.linux; 104 }; 105 }