From 6c7786074f8a3d925cd559bc6a51ba85e53bbd37 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sun, 5 Oct 2014 19:50:35 +0200
Subject: fix sound in minecraft for pulseaudio users

---
 pkgs/games/minecraft/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'pkgs/games/minecraft')

diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 9f79dd70c6a0..70bda820e2ec 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
-, mesa, openal, alsaOss }:
+, mesa, openal, alsaOss, pulseaudioSupport ? false, pulseaudio }:
 
 assert jre ? architecture;
 
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
 
     # wrapper for minecraft
     export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${jre}/lib/${jre.architecture}/:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
-    ${alsaOss}/bin/aoss ${jre}/bin/java -jar $out/minecraft.jar
+    ${if pulseaudioSupport then "${pulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \
+      ${jre}/bin/java -jar $out/minecraft.jar
     EOF
 
     chmod +x $out/bin/minecraft
-- 
cgit 1.4.1