diff options
| author | Carles Pagès <page@cubata.homelinux.net> | 2015-07-24 00:26:48 +0200 |
|---|---|---|
| committer | Carles Pagès <page@cubata.homelinux.net> | 2015-07-24 00:26:48 +0200 |
| commit | af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4 (patch) | |
| tree | 56796f0f621836262aad42f1fd2a23c402b49307 /pkgs/games/minecraft | |
| parent | 0e1d8f0d7d3e670499f5483d8d181fa05d500d75 (diff) | |
| download | nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar.gz nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar.bz2 nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar.lz nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar.xz nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.tar.zst nixpkgs-af71fbc6f1ee86dfe40d8a92eb4fd4a21414e3e4.zip | |
minecraft: fix wrapper
Adding jre lib path seems no longer needed, and so does padsp.
Diffstat (limited to 'pkgs/games/minecraft')
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 9a19366a074..218a84d591d 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,10 +1,11 @@ { 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 { - name = "minecraft-2013.07.01"; + name = "minecraft-2015.07.24"; src = fetchurl { url = "https://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"; @@ -22,8 +23,8 @@ stdenv.mkDerivation { #!${stdenv.shell} # 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/ - ${if pulseaudioSupport then "${libpulseaudio}/bin/padsp" else "${alsaOss}/bin/aoss" } \ + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/ + ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF |