diff options
author | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
---|---|---|
committer | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:34:50 +0200 |
commit | 8e9d8d8b70f2a5515ffa4b2dad18cf5783ab1e4e (patch) | |
tree | c2f70049be19f757f1ae6b2b80c3bfe70a47612c /nixpkgs/pkgs/games/minecraft | |
parent | 240cb27216dbb4203e2d470d78888b5cf82809ac (diff) | |
parent | 467ce5a9f45aaf96110b41eb863a56866e1c2c3c (diff) |
Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'
Diffstat (limited to 'nixpkgs/pkgs/games/minecraft')
-rw-r--r-- | nixpkgs/pkgs/games/minecraft/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/games/minecraft/default.nix b/nixpkgs/pkgs/games/minecraft/default.nix index b29d672d0e7..650bb223c9a 100644 --- a/nixpkgs/pkgs/games/minecraft/default.nix +++ b/nixpkgs/pkgs/games/minecraft/default.nix @@ -24,11 +24,11 @@ , curl , freetype , libpulseaudio +, libuuid , systemd , flite ? null , libXxf86vm ? null }: - let desktopItem = makeDesktopItem { name = "minecraft-launcher"; @@ -40,13 +40,13 @@ let }; 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.14947"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1f7b4gr2cnnf6wgxdz38215v31664q2pw00yibb3cjp8a9irvs47"; + sha256 = "1lsc39n1kq08sssnpr6kf4lfpy01a7i7rgvi298mmxsprjmc7a9q"; }; icon = fetchurl { @@ -142,6 +143,7 @@ in homepage = "https://minecraft.net"; maintainers = with maintainers; [ cpages ryantm infinisil ]; license = licenses.unfree; + platforms = [ "x86_64-linux" ]; }; passthru.updateScript = ./update.sh; |