lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

minecraft: fix wrapper

Adding jre lib path seems no longer needed, and so does padsp.

+7 -6
+6 -5
pkgs/games/minecraft/default.nix
··· 1 1 { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm 2 - , mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }: 2 + , mesa, openal 3 + , useAlsa ? false, alsaOss ? null }: 3 4 4 - assert jre ? architecture; 5 + assert useAlsa -> alsaOss != null; 5 6 6 7 stdenv.mkDerivation { 7 - name = "minecraft-2013.07.01"; 8 + name = "minecraft-2015.07.24"; 8 9 9 10 src = fetchurl { 10 11 url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; ··· 22 23 #!${stdenv.shell} 23 24 24 25 # wrapper for minecraft 25 - 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/ 26 - ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ 26 + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ 27 + ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ 27 28 ${jre}/bin/java -jar $out/minecraft.jar 28 29 EOF 29 30
+1 -1
pkgs/top-level/all-packages.nix
··· 2203 2203 mfoc = callPackage ../tools/security/mfoc { }; 2204 2204 2205 2205 minecraft = callPackage ../games/minecraft { 2206 - pulseaudioSupport = config.pulseaudio or true; 2206 + useAlsa = config.minecraft.alsa or false; 2207 2207 }; 2208 2208 2209 2209 minecraft-server = callPackage ../games/minecraft-server { };