Merge pull request #74136 from filalex77/runelite-2.0.0

runelite: 1.6.0 -> 2.0.0
This commit is contained in:
Mario Rodas 2020-01-06 09:24:41 -05:00 committed by GitHub
commit b103b3f13e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions

View file

@ -1,17 +1,17 @@
{ stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "runelite"; pname = "runelite";
version = "1.6.0"; version = "2.0.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar";
sha256 = "0q2xx0wrnlg5mrv8nnmnh300r8mqfm8k2p028m7mr09kn18xvkzx"; sha256 = "0q0x8g43ggkvp5fgnymgygx59xfhnyyrhpi6ha333gqg97rr0rvw";
}; };
icon = fetchurl { icon = fetchurl {
url = "https://github.com/runelite/runelite/raw/master/runelite-client/src/main/resources/runelite.png"; url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png";
sha256 = "0fxzkpsin09giqp7h8z0plxznk5d5j60sv34v1lw61p7d5y2izvr"; sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1";
}; };
desktop = makeDesktopItem { desktop = makeDesktopItem {
@ -43,11 +43,11 @@
--add-flags "-jar $out/share/runelite/RuneLite.jar" --add-flags "-jar $out/share/runelite/RuneLite.jar"
''; '';
meta = { meta = with lib; {
description = "Open source Old School RuneScape client"; description = "Open source Old School RuneScape client";
homepage = "https://runelite.net/"; homepage = "https://runelite.net/";
license = lib.licenses.bsd2; license = licenses.bsd2;
maintainers = [ lib.maintainers.kmeakin ]; maintainers = with maintainers; [ kmeakin ];
platforms = lib.platforms.all; platforms = platforms.all;
}; };
} }

View file

@ -6146,7 +6146,9 @@ in
rubocop = callPackage ../development/tools/rubocop { }; rubocop = callPackage ../development/tools/rubocop { };
runelite = callPackage ../games/runelite { }; runelite = callPackage ../games/runelite {
jre = openjdk11;
};
runningx = callPackage ../tools/X11/runningx { }; runningx = callPackage ../tools/X11/runningx { };