From 1e31eed1232ffe8fae6b08de7b30986485421042 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Sun, 1 Jan 2023 16:27:16 +0000
Subject: [PATCH 1/2] runescape-launcher: organize package lists

---
 pkgs/games/runescape-launcher/default.nix | 63 +++++++++++++++++------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix
index 9fd89c062e46..8f7938782c45 100644
--- a/pkgs/games/runescape-launcher/default.nix
+++ b/pkgs/games/runescape-launcher/default.nix
@@ -1,8 +1,27 @@
-{ stdenv, lib, buildFHSUserEnv, dpkg, glibc, gcc-unwrapped, autoPatchelfHook, fetchurl, wrapGAppsHook
-, gnome2, xorg
-, libSM, libXxf86vm, libX11, glib, pango, cairo, gtk2-x11, zlib, openssl_1_1
+{ stdenv
+, lib
+, autoPatchelfHook
+, buildFHSUserEnv
+, cairo
+, dpkg
+, fetchurl
+, gcc-unwrapped
+, glib
+, glibc
+, gnome2
+, gtk2-x11
+, libGL
 , libpulseaudio
-, SDL2, xorg_sys_opengl, libGL
+, libSM
+, libXxf86vm
+, libX11
+, openssl_1_1
+, pango
+, SDL2
+, wrapGAppsHook
+, xorg
+, xorg_sys_opengl
+, zlib
 }:
 let
 
@@ -19,30 +38,30 @@ let
 
     nativeBuildInputs = [
       autoPatchelfHook
-      wrapGAppsHook
       dpkg
+      wrapGAppsHook
     ];
 
     buildInputs = [
-      glibc
+      cairo
       gcc-unwrapped
+      glib
+      glibc
+      gtk2-x11
       libSM
       libXxf86vm
       libX11
-      glib
-      pango
-      cairo
-      gtk2-x11
-      zlib
       openssl_1_1
+      pango
+      zlib
     ];
 
     runtimeDependencies = [
-      libpulseaudio
       libGL
+      libpulseaudio
       SDL2
-      xorg_sys_opengl
       openssl_1_1
+      xorg_sys_opengl
       zlib
     ];
 
@@ -95,11 +114,23 @@ in
     name = "RuneScape";
     targetPkgs = pkgs: [
       runescape
-      dpkg glibc gcc-unwrapped
-      libSM libXxf86vm libX11 glib pango cairo gtk2-x11 zlib openssl_1_1
+      cairo
+      dpkg
+      gcc-unwrapped
+      glib
+      glibc
+      gtk2-x11
+      libGL
       libpulseaudio
+      libSM
+      libXxf86vm
+      libX11
+      openssl_1_1
+      pango
+      SDL2
       xorg.libX11
-      SDL2 xorg_sys_opengl libGL
+      xorg_sys_opengl
+      zlib
     ];
     multiPkgs = pkgs: [ libGL ];
     runScript = "runescape-launcher";

From ca66dbc21fe533574d0af12aadba6f219cfa9572 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Sun, 1 Jan 2023 16:29:51 +0000
Subject: [PATCH 2/2] runescape-launcher: install xdg-utils

The launcher uses the 'xdg-open' command to open
http URIs in the browser. Without this installed,
clicking links in the launcher will result in nothing
happening.
---
 pkgs/games/runescape-launcher/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/games/runescape-launcher/default.nix b/pkgs/games/runescape-launcher/default.nix
index 8f7938782c45..44a5b95974ed 100644
--- a/pkgs/games/runescape-launcher/default.nix
+++ b/pkgs/games/runescape-launcher/default.nix
@@ -19,6 +19,7 @@
 , pango
 , SDL2
 , wrapGAppsHook
+, xdg-utils
 , xorg
 , xorg_sys_opengl
 , zlib
@@ -61,6 +62,7 @@ let
       libpulseaudio
       SDL2
       openssl_1_1
+      xdg-utils # The launcher uses `xdg-open` to open HTTP URLs in the user's browser
       xorg_sys_opengl
       zlib
     ];
@@ -128,6 +130,7 @@ in
       openssl_1_1
       pango
       SDL2
+      xdg-utils
       xorg.libX11
       xorg_sys_opengl
       zlib