From 219077215c618351ede4ac872befd39c950cf269 Mon Sep 17 00:00:00 2001
From: Coca <me@coca.codes>
Date: Sun, 22 Mar 2026 05:21:39 +0000
Subject: [PATCH 1/2] Update nix package and copy nix changes over

Updated nixpkgs and pulled in changes from https://github.com/NixOS/nixpkgs/pull/481724 to keep the two consistent
---
 flake.lock      |  6 +++---
 nix/package.nix | 36 ++++++++++++++++++------------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/flake.lock b/flake.lock
index 834a2e9d..92389efe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769433173,
-        "narHash": "sha256-Gf1dFYgD344WZ3q0LPlRoWaNdNQq8kSBDLEWulRQSEs=",
+        "lastModified": 1773840656,
+        "narHash": "sha256-9tpvMGFteZnd3gRQZFlRCohVpqooygFuy9yjuyRL2C0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "13b0f9e6ac78abbbb736c635d87845c4f4bee51b",
+        "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512",
         "type": "github"
       },
       "original": {
diff --git a/nix/package.nix b/nix/package.nix
index 8b8b51b2..ce925413 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -8,13 +8,13 @@
   iconConvTools,
   copyDesktopItems,
   makeDesktopItem,
-  libX11,
-  libICE,
-  libSM,
-  libXi,
-  libXcursor,
-  libXext,
-  libXrandr,
+  libx11,
+  libice,
+  libsm,
+  libxi,
+  libxcursor,
+  libxext,
+  libxrandr,
   libGL,
   freetype,
   glib,
@@ -37,16 +37,16 @@
   soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
 }:
 let
-  version = "0.37.1";
   pname = "space-station-14-launcher";
+  version = "0.37.1";
 in
 buildDotnetModule rec {
   inherit pname;
 
   # Workaround to prevent buildDotnetModule from overriding assembly versions.
+  # If you inherit version it will break loading Robust.LoaderApi when connecting to a server!
   name = "${pname}-${version}";
 
-  # A bit redundant but I don't trust this package to be maintained by anyone else.
   src = fetchFromGitHub {
     owner = "space-wizards";
     repo = "SS14.Launcher";
@@ -87,13 +87,13 @@ buildDotnetModule rec {
     libGL
     freetype
     glib
-    libX11
-    libICE
-    libSM
-    libXi
-    libXcursor
-    libXext
-    libXrandr
+    libx11
+    libice
+    libsm
+    libxi
+    libxcursor
+    libxext
+    libxrandr
     at-spi2-atk
     at-spi2-core
     libxkbcommon
@@ -108,7 +108,7 @@ buildDotnetModule rec {
   # ${soundfont-path} is escaped here:
   # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45
   # via https://www.gnu.org/software/bash/manual/html_node/Shell-Parameter-Expansion.html under ${parameter@operator}
-  makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}'' ];
+  makeWrapperArgs = [ "--set ROBUST_SOUNDFONT_OVERRIDE ${soundfont-path}" ];
 
   executables = [ "SS14.Launcher" ];
 
@@ -128,7 +128,7 @@ buildDotnetModule rec {
     mkdir -p $out/lib/space-station-14-launcher/loader
     cp -r SS14.Loader/bin/${buildType}/*/*/* $out/lib/space-station-14-launcher/loader/
 
-    icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
+    icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico ${pname} $out
   '';
 
   meta = {

From 6e10253df7d356e56db213680b1f1953d04bc87a Mon Sep 17 00:00:00 2001
From: Coca <me@coca.codes>
Date: Sun, 22 Mar 2026 05:38:16 +0000
Subject: [PATCH 2/2] Fix file dialogs in nix package

Fixes the in-game MIDI players by providing the dbus package for the bundled SDL
---
 nix/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nix/package.nix b/nix/package.nix
index ce925413..4bf40e00 100644
--- a/nix/package.nix
+++ b/nix/package.nix
@@ -27,6 +27,7 @@
   libxkbcommon,
   wayland,
   fontconfig,
+  dbus,
   alsaSupport ? stdenv.hostPlatform.isLinux,
   jackSupport ? stdenv.hostPlatform.isLinux,
   pipewireSupport ? stdenv.hostPlatform.isLinux,
@@ -99,6 +100,7 @@ buildDotnetModule rec {
     libxkbcommon
     wayland
     fontconfig.lib
+    dbus
   ]
   ++ lib.optional alsaSupport alsa-lib
   ++ lib.optional jackSupport libjack2