diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-02 04:14:27 +0400 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-02 04:14:27 +0400 |
| commit | 8297d2c60cd67545b9377201517d222bc2e6ded5 (patch) | |
| tree | ce0d00390ef0625bb0f17fd5b0ee9caa72ebc2b4 | |
| parent | a1d61e736750159f6e860c7649d5f46dcade4d42 (diff) | |
| parent | ddb4ea19bc185368db241f3eb33d4bb0b23be155 (diff) | |
| download | nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar.gz nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar.bz2 nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar.lz nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar.xz nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.tar.zst nixlib-8297d2c60cd67545b9377201517d222bc2e6ded5.zip | |
Merge pull request #15124 from nathan7/master
minecraft: use makeLibraryPath, so we don't use the dev outputs
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 6f3093585b44..f3a8a34fa3b8 100644 --- 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 |