diff options
| author | Kier Davis <kierdavis@gmail.com> | 2016-12-29 01:33:39 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-12-29 02:33:39 +0100 |
| commit | f3e8a6df6bb15196edf7d59813e4100b7094231a (patch) | |
| tree | 620091d59477f223f2ae9c4cf73c93ddc1b6bdc8 /pkgs/games/multimc | |
| parent | 3c104ca71c37b664b4bb62d32c6ffa398e716b18 (diff) | |
| download | nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar.gz nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar.bz2 nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar.lz nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar.xz nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.tar.zst nixpkgs-f3e8a6df6bb15196edf7d59813e4100b7094231a.zip | |
multimc: update to Java 8 (#21485)
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.
Diffstat (limited to 'pkgs/games/multimc')
| -rw-r--r-- | pkgs/games/multimc/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index 00d4fbf8451..71c7e300a63 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -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; { |