public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minecraft: fix wrapper

Browse Source 
Adding jre lib path seems no longer needed, and so does padsp.
This commit is contained in:
Carles Pagès 2015-07-24 00:26:48 +02:00
parent 0e1d8f0d7d
commit af71fbc6f1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/games/minecraft/default.nix
View File

@ -1,10 +1,11 @@
{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, mesa, openal, alsaOss, pulseaudioSupport ? false, libpulseaudio }: , mesa, openal
, useAlsa ? false, alsaOss ? null }:
assert jre ? architecture; assert useAlsa -> alsaOss != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "minecraft-2013.07.01"; name = "minecraft-2015.07.24";
src = fetchurl { src = fetchurl {
url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar";
@ -22,8 +23,8 @@ stdenv.mkDerivation {
#!${stdenv.shell} #!${stdenv.shell}
# wrapper for minecraft # 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/ export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
${jre}/bin/java -jar $out/minecraft.jar ${jre}/bin/java -jar $out/minecraft.jar
EOF EOF

2
pkgs/top-level/all-packages.nix
View File

@ -2203,7 +2203,7 @@ let
mfoc = callPackage ../tools/security/mfoc { }; mfoc = callPackage ../tools/security/mfoc { };
minecraft = callPackage ../games/minecraft { minecraft = callPackage ../games/minecraft {
pulseaudioSupport = config.pulseaudio or true; useAlsa = config.minecraft.alsa or false;
}; };
minecraft-server = callPackage ../games/minecraft-server { }; minecraft-server = callPackage ../games/minecraft-server { };