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

minecraft: use makeLibraryPath, so we don't use the dev outputs

This commit is contained in:
Nathan Zadoks 2016-04-30 18:26:54 -04:00
parent 87ebab128a
commit ddb4ea19bc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
, mesa, openal , mesa, openal
, useAlsa ? false, alsaOss ? null }: , useAlsa ? false, alsaOss ? null }:
with stdenv.lib;
assert useAlsa -> alsaOss != null; assert useAlsa -> alsaOss != null;
@ -39,8 +40,7 @@ in stdenv.mkDerivation {
cat > $out/bin/minecraft << EOF cat > $out/bin/minecraft << EOF
#!${stdenv.shell} #!${stdenv.shell}
# wrapper for minecraft export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
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 "" } \ ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
${jre}/bin/java -jar $out/minecraft.jar ${jre}/bin/java -jar $out/minecraft.jar
EOF EOF