diff options
| author | Nathan Zadoks <nathan@nathan7.eu> | 2016-04-30 18:26:54 -0400 |
|---|---|---|
| committer | Nathan Zadoks <nathan@nathan7.eu> | 2016-05-01 20:13:20 -0400 |
| commit | ddb4ea19bc185368db241f3eb33d4bb0b23be155 (patch) | |
| tree | cf59e46d9f5f39f47227f2eda21daf45e2440705 /pkgs/games/minecraft | |
| parent | 87ebab128a466b6b3ac60711621ba6264cb7075a (diff) | |
| download | nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar.gz nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar.bz2 nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar.lz nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar.xz nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.tar.zst nixpkgs-ddb4ea19bc185368db241f3eb33d4bb0b23be155.zip | |
minecraft: use makeLibraryPath, so we don't use the dev outputs
Diffstat (limited to 'pkgs/games/minecraft')
| -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 6f3093585b4..f3a8a34fa3b 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 |