Merge pull request #15124 from nathan7/master

minecraft: use makeLibraryPath, so we don't use the dev outputs
NixOS · May 2, 2016 · 8297d2c · 8297d2c
2 parents a1d61e7 + ddb4ea1
commit 8297d2c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
@@ -2,6 +2,7 @@
 , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
 , mesa, openal
 , useAlsa ? false, alsaOss ? null }:
+with stdenv.lib;
 
 assert useAlsa -> alsaOss != null;
 
@@ -39,8 +40,7 @@ in stdenv.mkDerivation {
     cat > $out/bin/minecraft << EOF
     #!${stdenv.shell}
 
-    # wrapper for minecraft
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib/:${libXext}/lib/:${libXcursor}/lib/:${libXrandr}/lib/:${libXxf86vm}/lib/:${mesa}/lib/:${openal}/lib/
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]}
     ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \
       ${jre}/bin/java -jar $out/minecraft.jar
     EOF