Merge pull request #88218 from piperswe/piperswe/update-minecraft-launcher

This commit is contained in:
Silvan Mosberger 2020-05-30 22:57:25 +02:00 committed by GitHub
commit edf2e9fbd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,11 +24,11 @@
, curl , curl
, freetype , freetype
, libpulseaudio , libpulseaudio
, libuuid
, systemd , systemd
, flite ? null , flite ? null
, libXxf86vm ? null , libXxf86vm ? null
}: }:
let let
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "minecraft-launcher"; name = "minecraft-launcher";
@ -40,13 +40,13 @@ let
}; };
envLibPath = stdenv.lib.makeLibraryPath [ envLibPath = stdenv.lib.makeLibraryPath [
curl curl
libpulseaudio libpulseaudio
systemd systemd
alsaLib # needed for narrator alsaLib # needed for narrator
flite # needed for narrator flite # needed for narrator
libXxf86vm # needed only for versions <1.13 libXxf86vm # needed only for versions <1.13
]; ];
libPath = stdenv.lib.makeLibraryPath ([ libPath = stdenv.lib.makeLibraryPath ([
alsaLib alsaLib
@ -67,6 +67,7 @@ let
nss nss
stdenv.cc.cc stdenv.cc.cc
zlib zlib
libuuid
] ++ ] ++
(with xorg; [ (with xorg; [
libX11 libX11
@ -83,14 +84,14 @@ let
libXScrnSaver libXScrnSaver
])); ]));
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "minecraft-launcher"; pname = "minecraft-launcher";
version = "2.1.13509"; version = "2.1.14947";
src = fetchurl { src = fetchurl {
url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz";
sha256 = "1f7b4gr2cnnf6wgxdz38215v31664q2pw00yibb3cjp8a9irvs47"; sha256 = "1lsc39n1kq08sssnpr6kf4lfpy01a7i7rgvi298mmxsprjmc7a9q";
}; };
icon = fetchurl { icon = fetchurl {
@ -142,6 +143,7 @@ in
homepage = "https://minecraft.net"; homepage = "https://minecraft.net";
maintainers = with maintainers; [ cpages ryantm infinisil ]; maintainers = with maintainers; [ cpages ryantm infinisil ];
license = licenses.unfree; license = licenses.unfree;
platforms = [ "x86_64-linux" ];
}; };
passthru.updateScript = ./update.sh; passthru.updateScript = ./update.sh;