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";