From 14f36b6f87d5f4c2f00d846d82743b4f68323d11 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Wed, 1 Dec 2021 10:04:21 +0100 Subject: [PATCH 1/3] Update hash + add myself as maintainer Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 8b678d792fcb..78ebe606865a 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -12,7 +12,7 @@ let src = fetchurl { url = "https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb"; - sha256 = "0r5v1pwh0aas31b1d3pkrc8lqmqz9b4fml2b4kxmg5xzp677h271"; + sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; }; nativeBuildInputs = [ @@ -76,7 +76,7 @@ let description = "Launcher for RuneScape 3, the current main RuneScape"; homepage = "https://www.runescape.com/"; license = licenses.unfree; - maintainers = with lib.maintainers; [ grburst ]; + maintainers = with maintainers; [ grburst ]; platforms = [ "x86_64-linux" ]; }; }; @@ -100,4 +100,12 @@ in ]; multiPkgs = pkgs: [ libGL ]; runScript = "runescape-launcher"; + + meta = with lib; { + description = "Launcher for RuneScape 3"; + homepage = "https://www.runescape.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ grburst ]; + platforms = [ "x86_64-linux" ]; + }; } From 2f444f12c8c6dceba20db54b4afe33192a929a7d Mon Sep 17 00:00:00 2001 From: GRBurst Date: Wed, 1 Dec 2021 10:59:45 +0100 Subject: [PATCH 2/3] runescape-launcher: use package from archive.org Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 78ebe606865a..3385f57839f4 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -10,8 +10,9 @@ let pname = "runescape-launcher"; version = "2.2.9"; + # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { - url = "https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb"; + url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; }; @@ -89,23 +90,23 @@ in * FHS simulates a classic linux shell */ buildFHSUserEnv { - name = "RuneScape"; - targetPkgs = pkgs: [ - runescape - dpkg glibc gcc-unwrapped - libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl - libpulseaudio - xorg.libX11 - SDL2 xorg_sys_opengl libGL - ]; - multiPkgs = pkgs: [ libGL ]; - runScript = "runescape-launcher"; + name = "RuneScape"; + targetPkgs = pkgs: [ + runescape + dpkg glibc gcc-unwrapped + libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl + libpulseaudio + xorg.libX11 + SDL2 xorg_sys_opengl libGL + ]; + multiPkgs = pkgs: [ libGL ]; + runScript = "runescape-launcher"; - meta = with lib; { - description = "Launcher for RuneScape 3"; - homepage = "https://www.runescape.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ grburst ]; - platforms = [ "x86_64-linux" ]; - }; -} + meta = with lib; { + description = "RuneScape Game Client (NXT) - Launcher for RuneScape 3"; + homepage = "https://www.runescape.com/"; + license = licenses.unfree; + maintainers = with maintainers; [ grburst ]; + platforms = [ "x86_64-linux" ]; + }; + } From abe8ff56e274d80a82b51d022875123ffaa3ebc8 Mon Sep 17 00:00:00 2001 From: GRBurst Date: Fri, 28 Jan 2022 17:00:27 +0100 Subject: [PATCH 3/3] update remote package hash Signed-off-by: GRBurst --- pkgs/games/runescape-launcher/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix index 3385f57839f4..3208aa3b4612 100644 --- a/pkgs/games/runescape-launcher/default.nix +++ b/pkgs/games/runescape-launcher/default.nix @@ -10,10 +10,11 @@ let pname = "runescape-launcher"; version = "2.2.9"; + # Packages: https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages # upstream is https://content.runescape.com/downloads/ubuntu/pool/non-free/r/${pname}/${pname}_${version}_amd64.deb src = fetchurl { url = "https://archive.org/download/${pname}_${version}_amd64/${pname}_${version}_amd64.deb"; - sha256 = "10ly44lbgbbqc65lx7mhfzfjaiz1xj0mfjqlwlxz0sdjyw4a6ij6"; + sha256 = "1zilpxh8k8baylbl9nqq9kgjiv2xzw4lizbgcmzky5rhmych8n4g"; }; nativeBuildInputs = [