Merge pull request #12997 from ryantm/minecraft

minecraft: add desktop entry; add ryantm as maintainer

+24 -3
+1
lib/maintainers.nix
··· 278 rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; 279 rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>"; 280 rvlander = "Gaëtan André <rvlander@gaetanandre.eu>"; 281 rycee = "Robert Helgesson <robert@rycee.net>"; 282 samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; 283 sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
··· 278 rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>"; 279 rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>"; 280 rvlander = "Gaëtan André <rvlander@gaetanandre.eu>"; 281 + ryantm = "Ryan Mulligan <ryan@ryantm.com>"; 282 rycee = "Robert Helgesson <robert@rycee.net>"; 283 samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>"; 284 sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+23 -3
pkgs/games/minecraft/default.nix
··· 1 - { stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm 2 , mesa, openal 3 , useAlsa ? false, alsaOss ? null }: 4 5 assert useAlsa -> alsaOss != null; 6 7 - stdenv.mkDerivation { 8 name = "minecraft-2015.07.24"; 9 10 src = fetchurl { ··· 29 EOF 30 31 chmod +x $out/bin/minecraft 32 ''; 33 34 meta = { 35 description = "A sandbox-building game"; 36 homepage = http://www.minecraft.net; 37 - maintainers = [ stdenv.lib.maintainers.page ]; 38 license = stdenv.lib.licenses.unfreeRedistributable; 39 }; 40 }
··· 1 + { stdenv, fetchurl, makeDesktopItem 2 + , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm 3 , mesa, openal 4 , useAlsa ? false, alsaOss ? null }: 5 6 assert useAlsa -> alsaOss != null; 7 8 + let 9 + icon = fetchurl { 10 + url = "https://hydra-media.cursecdn.com/minecraft.gamepedia.com/c/c5/Grass.png"; 11 + sha256 = "438c0f63e379e92af1b5b2e06cc5e3365ee272810af65ebc102304bce4fa8c4b"; 12 + }; 13 + 14 + desktopItem = makeDesktopItem { 15 + name = "minecraft"; 16 + exec = "minecraft"; 17 + icon = "${icon}"; 18 + comment = "A sandbox-building game"; 19 + desktopName = "Minecraft"; 20 + genericName = "minecraft"; 21 + categories = "Game;"; 22 + }; 23 + 24 + in stdenv.mkDerivation { 25 name = "minecraft-2015.07.24"; 26 27 src = fetchurl { ··· 46 EOF 47 48 chmod +x $out/bin/minecraft 49 + 50 + mkdir -p $out/share/applications 51 + ln -s ${desktopItem}/share/applications/* $out/share/applications/ 52 ''; 53 54 meta = { 55 description = "A sandbox-building game"; 56 homepage = http://www.minecraft.net; 57 + maintainers = with stdenv.lib.maintainers; [ page ryantm ]; 58 license = stdenv.lib.licenses.unfreeRedistributable; 59 }; 60 }