diff options
Diffstat (limited to 'pkgs/games/minecraft/default.nix')
| -rw-r--r-- | pkgs/games/minecraft/default.nix | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index b29d672d0e7..9d23515c039 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -24,11 +24,11 @@ , curl , freetype , libpulseaudio +, libuuid , systemd , flite ? null , libXxf86vm ? null }: - let desktopItem = makeDesktopItem { name = "minecraft-launcher"; @@ -36,17 +36,17 @@ let icon = "minecraft-launcher"; comment = "Official launcher for Minecraft, a sandbox-building game"; desktopName = "Minecraft Launcher"; - categories = "Game;Application;"; + categories = "Game;"; }; envLibPath = stdenv.lib.makeLibraryPath [ - curl - libpulseaudio - systemd - alsaLib # needed for narrator - flite # needed for narrator - libXxf86vm # needed only for versions <1.13 - ]; + curl + libpulseaudio + systemd + alsaLib # needed for narrator + flite # needed for narrator + libXxf86vm # needed only for versions <1.13 + ]; libPath = stdenv.lib.makeLibraryPath ([ alsaLib @@ -67,6 +67,7 @@ let nss stdenv.cc.cc zlib + libuuid ] ++ (with xorg; [ libX11 @@ -83,14 +84,14 @@ let libXScrnSaver ])); in - stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.13509"; + version = "2.1.16102"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1f7b4gr2cnnf6wgxdz38215v31664q2pw00yibb3cjp8a9irvs47"; + sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i"; }; icon = fetchurl { @@ -133,6 +134,7 @@ in makeWrapper $out/opt/minecraft-launcher/minecraft-launcher $out/bin/minecraft-launcher \ --prefix LD_LIBRARY_PATH : ${envLibPath} \ --prefix PATH : ${stdenv.lib.makeBinPath [ jre ]} \ + --set JAVA_HOME ${stdenv.lib.makeBinPath [ jre ]} \ --run "cd /tmp" \ "''${gappsWrapperArgs[@]}" ''; @@ -142,6 +144,7 @@ in homepage = "https://minecraft.net"; maintainers = with maintainers; [ cpages ryantm infinisil ]; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; }; passthru.updateScript = ./update.sh; |