Skip to content

Commit 038df39

Browse files
committed
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
1 parent 7e482f3 commit 038df39

2 files changed

Lines changed: 39 additions & 183 deletions

File tree

pkgs/by-name/sp/space-station-14-launcher/deps.json

Lines changed: 21 additions & 111 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkgs/by-name/sp/space-station-14-launcher/package.nix

Lines changed: 18 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
buildDotnetModule,
66
dotnetCorePackages,
77
fetchFromGitHub,
8-
wrapGAppsHook4,
98
iconConvTools,
109
copyDesktopItems,
1110
makeDesktopItem,
@@ -16,37 +15,29 @@
1615
libXcursor,
1716
libXext,
1817
libXrandr,
19-
fontconfig,
20-
glew,
21-
glfw,
22-
glibc,
2318
libGL,
2419
freetype,
25-
openal,
26-
fluidsynth,
27-
gtk3,
28-
pango,
29-
atk,
30-
cairo,
31-
zlib,
3220
glib,
33-
gdk-pixbuf,
3421
alsa-lib,
3522
libjack2,
3623
pipewire,
3724
libpulseaudio,
38-
alsaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
39-
jackSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
40-
pipewireSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
41-
pulseaudioSupport ?
42-
config.pulseaudio or stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAndroid,
25+
at-spi2-atk,
26+
at-spi2-core,
27+
libxkbcommon,
28+
wayland,
29+
fontconfig,
30+
alsaSupport ? stdenv.hostPlatform.isLinux,
31+
jackSupport ? stdenv.hostPlatform.isLinux,
32+
pipewireSupport ? stdenv.hostPlatform.isLinux,
33+
pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
4334
soundfont-fluid,
4435

4536
# Path to set ROBUST_SOUNDFONT_OVERRIDE to, essentially the default soundfont used.
4637
soundfont-path ? "${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2",
4738
}:
4839
let
49-
version = "0.35.0";
40+
version = "0.36.1";
5041
pname = "space-station-14-launcher";
5142
in
5243
buildDotnetModule rec {
@@ -60,7 +51,7 @@ buildDotnetModule rec {
6051
owner = "space-wizards";
6152
repo = "SS14.Launcher";
6253
tag = "v${version}";
63-
hash = "sha256-8YDlX5GwL5S/gdjIWOa48sEGA/sMEYZvy2FTWSPO+Ug=";
54+
hash = "sha256-6wH2CkTuwy+a3EGpKrdLDsIaQ7oZc2I1OLdmAREMazw=";
6455
fetchSubmodules = true;
6556
};
6657

@@ -78,14 +69,8 @@ buildDotnetModule rec {
7869
inherit version;
7970
};
8071

81-
# SDK 8.0 required for Robust.LoaderApi
82-
dotnet-sdk =
83-
with dotnetCorePackages;
84-
combinePackages [
85-
sdk_9_0
86-
sdk_8_0
87-
];
88-
dotnet-runtime = dotnetCorePackages.runtime_9_0;
72+
dotnet-sdk = dotnetCorePackages.sdk_10_0;
73+
dotnet-runtime = dotnetCorePackages.runtime_10_0;
8974

9075
dotnetFlags = [
9176
"-p:FullRelease=true"
@@ -94,59 +79,26 @@ buildDotnetModule rec {
9479
];
9580

9681
nativeBuildInputs = [
97-
wrapGAppsHook4
9882
iconConvTools
9983
copyDesktopItems
10084
];
10185

102-
LD_LIBRARY_PATH = lib.makeLibraryPath [
103-
fontconfig
104-
libX11
105-
libICE
106-
libSM
107-
libXi
108-
libXcursor
109-
libXext
110-
libXrandr
111-
112-
glfw
113-
glibc
114-
libGL
115-
openal
116-
freetype
117-
fluidsynth
118-
];
119-
12086
runtimeDeps = [
121-
# Required by the game.
122-
glfw
123-
glibc
12487
libGL
125-
openal
12688
freetype
127-
fluidsynth
128-
129-
# Needed for file dialogs.
130-
gtk3
131-
pango
132-
cairo
133-
atk
134-
zlib
13589
glib
136-
gdk-pixbuf
137-
138-
# Avalonia UI dependencies.
13990
libX11
14091
libICE
14192
libSM
14293
libXi
14394
libXcursor
14495
libXext
14596
libXrandr
146-
fontconfig
147-
glew
148-
149-
# TODO: Figure out dependencies for CEF support.
97+
at-spi2-atk
98+
at-spi2-core
99+
libxkbcommon
100+
wayland
101+
fontconfig.lib
150102
]
151103
++ lib.optional alsaSupport alsa-lib
152104
++ lib.optional jackSupport libjack2
@@ -179,12 +131,6 @@ buildDotnetModule rec {
179131
icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
180132
'';
181133

182-
dontWrapGApps = true;
183-
184-
preFixup = ''
185-
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
186-
'';
187-
188134
meta = {
189135
description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster";
190136
homepage = "https://spacestation14.io";

0 commit comments

Comments
 (0)