From e24ada62093d5c37613da4857418b7cbe55f11fc Mon Sep 17 00:00:00 2001 From: Coca Date: Thu, 16 Oct 2025 09:19:09 +0100 Subject: [PATCH 1/3] space-station-14-launcher: 0.33.0 -> 0.35.0 --- .../sp/space-station-14-launcher/deps.json | 199 +++++++++++++----- .../sp/space-station-14-launcher/package.nix | 4 +- 2 files changed, 149 insertions(+), 54 deletions(-) diff --git a/pkgs/by-name/sp/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json index 5dee9fb6ad82..c92c779db30f 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/deps.json +++ b/pkgs/by-name/sp/space-station-14-launcher/deps.json @@ -41,8 +41,8 @@ }, { "pname": "Avalonia.Markup.Xaml.Loader", - "version": "11.2.4", - "hash": "sha256-iSf5UmeWi6D7uVblYj3eMN9pljwKA6O0pAz1UYE38kQ=" + "version": "11.0.0", + "hash": "sha256-ZpKpPjPOhJWUiUinuR+Zvo/BSr86b5WpUqIunON1zns=" }, { "pname": "Avalonia.Native", @@ -99,6 +99,11 @@ "version": "6.6.4", "hash": "sha256-Xe9sGzIdQ970f0RwxD3KhdfqvGUoTpim2u2oqYHkDcI=" }, + { + "pname": "Fody", + "version": "6.9.2", + "hash": "sha256-rQAVA3ybnZhbX/n5QaMEg0qbM2fKTOHcLLr84CQt1G0=" + }, { "pname": "HarfBuzzSharp", "version": "7.3.0.3", @@ -126,13 +131,23 @@ }, { "pname": "HotAvalonia", - "version": "2.1.0", - "hash": "sha256-dAsVw79exJeQBCCMwJDv7SWARl3dcSIEYcjcmusLqJM=" + "version": "3.0.0", + "hash": "sha256-Y4XM1tvillcGh7Xa5ilDVIr7Inyod3fXPtu+d/LEay8=" + }, + { + "pname": "HotAvalonia.Core", + "version": "3.0.0", + "hash": "sha256-4yICwumuV1DenqjiJ6B4ULE++c6JWHcQSfdLXoNH618=" }, { "pname": "HotAvalonia.Extensions", - "version": "2.1.0", - "hash": "sha256-96H37VvKh2E42KNXtUClhvArcJeX6/diooD2HEcNbOY=" + "version": "3.0.0", + "hash": "sha256-nnn2uHkul8+73FtR3qpYA3knITG8TFKOWixmuFGAprM=" + }, + { + "pname": "HotAvalonia.Fody", + "version": "3.0.0", + "hash": "sha256-5lLLAakzPRc8HKnabMmp7Vg9zfxHxzYgR926IPeFH0A=" }, { "pname": "JetBrains.Annotations", @@ -141,8 +156,8 @@ }, { "pname": "libsodium", - "version": "1.0.18.2", - "hash": "sha256-gjaW2AYXQSb3LLjtQDjWSxkTmEiqIoIb7NFx0+AlrQs=" + "version": "1.0.20.1", + "hash": "sha256-wd/z31FRbcaVGrogSNVjefEYWjNxTGzQd04DOlY1PFE=" }, { "pname": "Linguini.Bundle", @@ -174,50 +189,30 @@ "version": "8.0.0", "hash": "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48=" }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "Microsoft.NETCore.Targets", + "version": "1.1.0", + "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + }, { "pname": "Microsoft.Toolkit.Mvvm", "version": "7.1.2", "hash": "sha256-JOxZGQGm1WPkIpIDurQnlYk+QgHxJLPguJfCQLJ8NEM=" }, - { - "pname": "Mono.Cecil", - "version": "0.11.5", - "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA=" - }, { "pname": "Mono.Posix.NETStandard", "version": "1.0.0", "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY=" }, - { - "pname": "MonoMod.Backports", - "version": "1.1.2", - "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38=" - }, - { - "pname": "MonoMod.Core", - "version": "1.2.1", - "hash": "sha256-EQ4CX9OGxBPMDqMCdrudkGY/ywZUi3rtFszDcgp7MBg=" - }, - { - "pname": "MonoMod.ILHelpers", - "version": "1.1.0", - "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw=" - }, - { - "pname": "MonoMod.RuntimeDetour", - "version": "25.2.1", - "hash": "sha256-ZlgzMqquKWwv8+MvOhIEdvoPShFe7nUAZ3evWhGoLsc=" - }, - { - "pname": "MonoMod.Utils", - "version": "25.0.7", - "hash": "sha256-GegA6fMRLYVeB75ypkIfTdqgGT38fcKqY/McqZE27qQ=" - }, { "pname": "NSec.Cryptography", - "version": "22.4.0", - "hash": "sha256-TVB8MDXan3dQphaYG/rLQMWgpYJ6WE5ORiqiQrfnCW0=" + "version": "25.4.0", + "hash": "sha256-jwsuS+Kp+sD31S41tTHv/zkFqnzxnGOEty2iZVmBb6E=" }, { "pname": "ReactiveUI", @@ -231,8 +226,8 @@ }, { "pname": "Robust.Natives", - "version": "0.1.1", - "hash": "sha256-/DPbgIzIqZx7ClHKSgI88p03xwKSNWY/MqNri2ZX7uo=" + "version": "0.2.3", + "hash": "sha256-EwaSVnPsDSjY61vBIHaRSs/xpigGPqRStjYLcz+xaB0=" }, { "pname": "Robust.Natives.Angle", @@ -241,34 +236,84 @@ }, { "pname": "Robust.Natives.Fluidsynth", - "version": "0.1.0", - "hash": "sha256-XRyvRqEcEFFvXSjcvNRl9MIMAY42nWRrC7pHqQvn0wI=" + "version": "0.2.1-fluidsynth2.4.6", + "hash": "sha256-M5YcA5vwSABOz39WMy35wEiZ0Qkmtv6Om/tveYH67dA=" }, { "pname": "Robust.Natives.Freetype", - "version": "0.1.0", - "hash": "sha256-gufHmxKub3204pAYvcLegY80LMoKPY5u3Z3uIleReWo=" + "version": "0.2.1-freetype2.13.3", + "hash": "sha256-kSh5XbkYZm6QygkVZ3AyXbw7/57rPpXBLgvSGgBjHrs=" }, { "pname": "Robust.Natives.Glfw", - "version": "0.1.0", - "hash": "sha256-YDL7w5wVb2Il/O4PRlxPgYUOlM2Ksu+kIrlKc1qYynU=" + "version": "0.2.1", + "hash": "sha256-aT3hgPrrgoiwrysTWluE57siQ8WF/wH9BLcTErORJgE=" }, { "pname": "Robust.Natives.OpenAL", - "version": "0.1.0", - "hash": "sha256-3dIpRKPASi8wu8eMWSC/M4CNJK1WKKJVB4XVXKSeihs=" + "version": "0.2.1-openal1.24.3", + "hash": "sha256-YTv/uWovpVTF9/IM0IvAlIO0bZxt91MV7DtynJmXSYM=" + }, + { + "pname": "Robust.Natives.Sdl3", + "version": "0.1.1-sdl3.2.20", + "hash": "sha256-dQPO/zME+e/Hsmic32hn5YIy4+LKfjDk064o6N7PKvM=" }, { "pname": "Robust.Natives.Swnfd", "version": "0.1.0", "hash": "sha256-Qav0yDVQ30eV31Gz+oMXJvHQnP+XrOicakw4rb6hVus=" }, + { + "pname": "Robust.Natives.Zstd", + "version": "0.1.1-zstd1.5.7", + "hash": "sha256-3Na821HUgGmqley8eBY/fZ1rM62Kr8fVE8Dg4h1LIwk=" + }, { "pname": "Robust.Shared.AuthLib", "version": "0.1.2", "hash": "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4=" }, + { + "pname": "runtime.any.System.IO", + "version": "4.3.0", + "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" + }, + { + "pname": "runtime.any.System.Reflection", + "version": "4.3.0", + "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" + }, + { + "pname": "runtime.any.System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" + }, + { + "pname": "runtime.any.System.Runtime", + "version": "4.3.0", + "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" + }, + { + "pname": "runtime.any.System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" + }, + { + "pname": "runtime.any.System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" + }, + { + "pname": "runtime.native.System", + "version": "4.3.0", + "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" + }, + { + "pname": "runtime.unix.System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" + }, { "pname": "Serilog", "version": "2.12.0", @@ -354,6 +399,11 @@ "version": "5.0.0", "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, + { + "pname": "System.IO", + "version": "4.3.0", + "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" + }, { "pname": "System.IO.Pipelines", "version": "8.0.0", @@ -374,6 +424,11 @@ "version": "8.0.0", "hash": "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M=" }, + { + "pname": "System.Private.Uri", + "version": "4.3.0", + "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" + }, { "pname": "System.Reactive", "version": "6.0.0", @@ -384,10 +439,50 @@ "version": "6.0.1", "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, + { + "pname": "System.Reflection", + "version": "4.3.0", + "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" + }, + { + "pname": "System.Reflection.Emit", + "version": "4.3.0", + "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" + }, + { + "pname": "System.Reflection.Emit.ILGeneration", + "version": "4.3.0", + "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" + }, + { + "pname": "System.Reflection.Metadata", + "version": "9.0.3", + "hash": "sha256-57O/tttsJHnDr/1+gVkv+qmfncoXxP0s2i5U0dYEma0=" + }, + { + "pname": "System.Reflection.Primitives", + "version": "4.3.0", + "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" + }, + { + "pname": "System.Runtime", + "version": "4.3.0", + "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" + }, + { + "pname": "System.Text.Encoding", + "version": "4.3.0", + "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" + }, + { + "pname": "System.Threading.Tasks", + "version": "4.3.0", + "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" + }, { "pname": "TerraFX.Interop.Windows", - "version": "10.0.22621.1", - "hash": "sha256-0golrteOhpZblYuKjM3YP2rswAv/hzWDQ6I9rT9TcWE=" + "version": "10.0.26100.2", + "hash": "sha256-dIyetiPHgFg3cXN620ur3O/O3c+7Piw+KKzr88SlpHw=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 6cc82e3cba81..e1a02b008761 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -36,7 +36,7 @@ soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2", }: let - version = "0.33.0"; + version = "0.35.0"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -50,7 +50,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; tag = "v${version}"; - hash = "sha256-mEockP4fcNFP0h1j30cV2Czq751xjjpdaqQ0Wxe0+7M="; + hash = "sha256-8YDlX5GwL5S/gdjIWOa48sEGA/sMEYZvy2FTWSPO+Ug="; fetchSubmodules = true; }; From 7e482f30473feb045084b03aed8e786ba2e27124 Mon Sep 17 00:00:00 2001 From: Coca Date: Thu, 16 Oct 2025 17:03:00 +0100 Subject: [PATCH 2/3] space-station-14-launcher: fix audio libraries for bundled SDL2 Audio libraries now have to be included manually as SDL2 was bundled into the launcher and thusly has them no longer provided through it. --- .../sp/space-station-14-launcher/package.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index e1a02b008761..431cf922b9b8 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -1,5 +1,7 @@ { lib, + stdenv, + config, buildDotnetModule, dotnetCorePackages, fetchFromGitHub, @@ -16,7 +18,6 @@ libXrandr, fontconfig, glew, - SDL2, glfw, glibc, libGL, @@ -30,6 +31,15 @@ zlib, glib, gdk-pixbuf, + alsa-lib, + libjack2, + pipewire, + libpulseaudio, + alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, + jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, + pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, + pulseaudioSupport ? + config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, soundfont-fluid, # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used. @@ -100,7 +110,6 @@ buildDotnetModule rec { libXrandr glfw - SDL2 glibc libGL openal @@ -111,7 +120,6 @@ buildDotnetModule rec { runtimeDeps = [ # Required by the game. glfw - SDL2 glibc libGL openal @@ -139,7 +147,11 @@ buildDotnetModule rec { glew # TODO: Figure out dependencies for CEF support. - ]; + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional jackSupport libjack2 + ++ lib.optional pipewireSupport pipewire + ++ lib.optional pulseaudioSupport libpulseaudio; # ${soundfont-path} is escaped here: # https://github.com/NixOS/nixpkgs/blob/d29975d32b1dc7fe91d5cb275d20f8f8aba399ad/pkgs/build-support/setup-hooks/make-wrapper.sh#L126C35-L126C45 From 038df396235db5d2c4a59aeb6304b4d1ab8e0185 Mon Sep 17 00:00:00 2001 From: Coca Date: Wed, 17 Dec 2025 19:57:37 +0000 Subject: [PATCH 3/3] space-station-14-launcher: 0.35.0 -> 0.36.1 Brings in multiple updates to the package build from https://github.com/space-wizards/SS14.Launcher/blob/171b5d1892ae43a825a9311b46a466e44c26b4f5/nix/package.nix --- .../sp/space-station-14-launcher/deps.json | 132 +++--------------- .../sp/space-station-14-launcher/package.nix | 90 +++--------- 2 files changed, 39 insertions(+), 183 deletions(-) diff --git a/pkgs/by-name/sp/space-station-14-launcher/deps.json b/pkgs/by-name/sp/space-station-14-launcher/deps.json index c92c779db30f..68ed066bb63d 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/deps.json +++ b/pkgs/by-name/sp/space-station-14-launcher/deps.json @@ -179,6 +179,16 @@ "version": "0.11.0", "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" }, + { + "pname": "Microsoft.AspNetCore.App.Ref", + "version": "8.0.22", + "hash": "sha256-Gs0Nq1KQ3rgHzwe8GQbCTbw6i1FGfa08YGyXGZDj6W8=" + }, + { + "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64", + "version": "8.0.22", + "hash": "sha256-UMkCtSyjARdWST3hx0M9RXPwhrYN+DvIh8bSniFVAuA=" + }, { "pname": "Microsoft.Data.Sqlite.Core", "version": "7.0.4", @@ -190,14 +200,19 @@ "hash": "sha256-BAbtucZQvBgbiJ51UAL/Ilx+dz96LpWmfjnnNGlcw48=" }, { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.1.0", - "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + "pname": "Microsoft.NETCore.App.Host.linux-x64", + "version": "8.0.22", + "hash": "sha256-7ie1B9o9D3Sgr88KxKs7IfhGlypuX4YzEkpe9SA+PNs=" }, { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" + "pname": "Microsoft.NETCore.App.Ref", + "version": "8.0.22", + "hash": "sha256-00SIT4Pme2xeYb8PUSALAnHeOIR3UlJwlK0hRZkzjS4=" + }, + { + "pname": "Microsoft.NETCore.App.Runtime.linux-x64", + "version": "8.0.22", + "hash": "sha256-cociJC//cl8d2TeOecGUAwbbfv29pMQZpu2z58B7mpE=" }, { "pname": "Microsoft.Toolkit.Mvvm", @@ -274,46 +289,6 @@ "version": "0.1.2", "hash": "sha256-ANaf6S0tsocsw37RJvk9d4LcvVQ0+1yO900iG1BLwe4=" }, - { - "pname": "runtime.any.System.IO", - "version": "4.3.0", - "hash": "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE=" - }, - { - "pname": "runtime.any.System.Reflection", - "version": "4.3.0", - "hash": "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk=" - }, - { - "pname": "runtime.any.System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ=" - }, - { - "pname": "runtime.any.System.Runtime", - "version": "4.3.0", - "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM=" - }, - { - "pname": "runtime.any.System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs=" - }, - { - "pname": "runtime.any.System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4=" - }, - { - "pname": "runtime.native.System", - "version": "4.3.0", - "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y=" - }, - { - "pname": "runtime.unix.System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs=" - }, { "pname": "Serilog", "version": "2.12.0", @@ -399,36 +374,11 @@ "version": "5.0.0", "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg=" }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, - { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" - }, - { - "pname": "System.Memory", - "version": "4.5.3", - "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk=" - }, - { - "pname": "System.Memory", - "version": "4.5.4", - "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" - }, { "pname": "System.Net.Http.WinHttpHandler", "version": "8.0.0", "hash": "sha256-wSK5KtWvlDp8WLNddCmAM66uGyj9/KfJyCh8ht1PD1M=" }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, { "pname": "System.Reactive", "version": "6.0.0", @@ -439,46 +389,6 @@ "version": "6.0.1", "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q=" }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "9.0.3", - "hash": "sha256-57O/tttsJHnDr/1+gVkv+qmfncoXxP0s2i5U0dYEma0=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, { "pname": "TerraFX.Interop.Windows", "version": "10.0.26100.2", diff --git a/pkgs/by-name/sp/space-station-14-launcher/package.nix b/pkgs/by-name/sp/space-station-14-launcher/package.nix index 431cf922b9b8..443fb3d51ab5 100644 --- a/pkgs/by-name/sp/space-station-14-launcher/package.nix +++ b/pkgs/by-name/sp/space-station-14-launcher/package.nix @@ -5,7 +5,6 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, - wrapGAppsHook4, iconConvTools, copyDesktopItems, makeDesktopItem, @@ -16,37 +15,29 @@ libXcursor, libXext, libXrandr, - fontconfig, - glew, - glfw, - glibc, libGL, freetype, - openal, - fluidsynth, - gtk3, - pango, - atk, - cairo, - zlib, glib, - gdk-pixbuf, alsa-lib, libjack2, pipewire, libpulseaudio, - alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, - pulseaudioSupport ? - config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid, + at-spi2-atk, + at-spi2-core, + libxkbcommon, + wayland, + fontconfig, + alsaSupport ? stdenv.hostPlatform.isLinux, + jackSupport ? stdenv.hostPlatform.isLinux, + pipewireSupport ? stdenv.hostPlatform.isLinux, + pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux, soundfont-fluid, # Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used. soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2", }: let - version = "0.35.0"; + version = "0.36.1"; pname = "space-station-14-launcher"; in buildDotnetModule rec { @@ -60,7 +51,7 @@ buildDotnetModule rec { owner = "space-wizards"; repo = "SS14.Launcher"; tag = "v${version}"; - hash = "sha256-8YDlX5GwL5S/gdjIWOa48sEGA/sMEYZvy2FTWSPO+Ug="; + hash = "sha256-6wH2CkTuwy+a3EGpKrdLDsIaQ7oZc2I1OLdmAREMazw="; fetchSubmodules = true; }; @@ -78,14 +69,8 @@ buildDotnetModule rec { inherit version; }; - # SDK 8.0 required for Robust.LoaderApi - dotnet-sdk = - with dotnetCorePackages; - combinePackages [ - sdk_9_0 - sdk_8_0 - ]; - dotnet-runtime = dotnetCorePackages.runtime_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; dotnetFlags = [ "-p:FullRelease=true" @@ -94,48 +79,14 @@ buildDotnetModule rec { ]; nativeBuildInputs = [ - wrapGAppsHook4 iconConvTools copyDesktopItems ]; - LD_LIBRARY_PATH = lib.makeLibraryPath [ - fontconfig - libX11 - libICE - libSM - libXi - libXcursor - libXext - libXrandr - - glfw - glibc - libGL - openal - freetype - fluidsynth - ]; - runtimeDeps = [ - # Required by the game. - glfw - glibc libGL - openal freetype - fluidsynth - - # Needed for file dialogs. - gtk3 - pango - cairo - atk - zlib glib - gdk-pixbuf - - # Avalonia UI dependencies. libX11 libICE libSM @@ -143,10 +94,11 @@ buildDotnetModule rec { libXcursor libXext libXrandr - fontconfig - glew - - # TODO: Figure out dependencies for CEF support. + at-spi2-atk + at-spi2-core + libxkbcommon + wayland + fontconfig.lib ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 @@ -179,12 +131,6 @@ buildDotnetModule rec { icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out ''; - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - meta = { description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; homepage = "https://spacestation14.io";