From f930613999f07df1d123ebba2c20d6a443bffe66 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 25 Nov 2019 13:23:51 +0200 Subject: [PATCH] runelite: 1.6.0 -> 2.0.0 Co-authored-by: Mario Rodas --- pkgs/games/runelite/default.nix | 20 ++++++++++---------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 77d1888b86e7..9b6ca4f7c057 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, makeWrapper, jre, makeDesktopItem, lib }: - stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "runelite"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { url = "https://github.com/runelite/launcher/releases/download/${version}/RuneLite.jar"; - sha256 = "0q2xx0wrnlg5mrv8nnmnh300r8mqfm8k2p028m7mr09kn18xvkzx"; + sha256 = "0q0x8g43ggkvp5fgnymgygx59xfhnyyrhpi6ha333gqg97rr0rvw"; }; icon = fetchurl { - url = "https://github.com/runelite/runelite/raw/master/runelite-client/src/main/resources/runelite.png"; - sha256 = "0fxzkpsin09giqp7h8z0plxznk5d5j60sv34v1lw61p7d5y2izvr"; + url = "https://github.com/runelite/launcher/raw/${version}/appimage/runelite.png"; + sha256 = "04fcjm7p546gr82g0jbh497j7rnh70lrvas0k171bff4v3knrjw1"; }; desktop = makeDesktopItem { @@ -43,11 +43,11 @@ --add-flags "-jar $out/share/runelite/RuneLite.jar" ''; - meta = { + meta = with lib; { description = "Open source Old School RuneScape client"; homepage = "https://runelite.net/"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.kmeakin ]; - platforms = lib.platforms.all; + license = licenses.bsd2; + maintainers = with maintainers; [ kmeakin ]; + platforms = platforms.all; }; - } +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d571ba3a8c3..8605ccc8a9b3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6093,7 +6093,9 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { }; + runelite = callPackage ../games/runelite { + jre = openjdk11; + }; runningx = callPackage ../tools/X11/runningx { };