ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

multimc: update to Java 8 (#21485)

Browse Source 
Technically, this changes the version of Java depended on from 7 to
the default, which is currently 7 on darwin and 8 on all other
systems.
This commit is contained in:
Kier Davis 2016-12-29 01:33:39 +00:00 committed by Robin Gloster
parent 3c104ca71c
commit f3e8a6df6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/multimc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
let
libnbt = fetchFromGitHub {
@ -16,7 +16,7 @@ stdenv.mkDerivation {
rev = "895d8ab4699f1b50bf03532c967a91f5ecb62a50";
sha256 = "179vc1iv57fx4g4h1wy8yvyvdm671jnvp6zi8pcr1n6azqhwklds";
};
buildInputs = [ cmake qt5Full jdk7 zlib file makeWrapper ];
buildInputs = [ cmake qt5Full jdk zlib file makeWrapper ];
libpath = with xorg; [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
postUnpack = ''
@ -42,7 +42,7 @@ stdenv.mkDerivation {
cp -v MultiMC $out/bin/
cp -v jars/*.jar $out/bin/jars/ #*/
cp -v librainbow.so libnbt++.so libMultiMC_logic.so $out/lib
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk7}/bin/
wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH $RESULT --prefix PATH : ${jdk}/bin/
'';
meta = with stdenv.lib; {