Nix package cleanup, remove wrap and use ROBUST_SOUNDFONT_OVERRIDE (s…

…pace-wizards#113)
Visne · Nov 5, 2023 · 7e3967b · 7e3967b
1 parent 21800a1
commit 7e3967b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 42 deletions.
diff --git a/flake.nix b/flake.nix
@@ -14,7 +14,7 @@
       packages = forAllSystems (pkgs: {
         default = self.packages.${pkgs.system}.space-station-14-launcher;
         space-station-14-launcher =
-          pkgs.callPackage ./nix/wrapper.nix { };
+          pkgs.callPackage ./nix/package.nix { };
       });
 
       overlays = {

diff --git a/nix/package.nix b/nix/package.nix
@@ -29,6 +29,11 @@
 , zlib
 , glib
 , gdk-pixbuf
+, 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.24.0";
@@ -107,6 +112,8 @@ buildDotnetModule rec {
     # TODO: Figure out dependencies for CEF support.
   ];
 
+  makeWrapperArgs = [ ''--set ROBUST_SOUNDFONT_OVERRIDE "${soundfont-path}"'' ];
+
   executables = [ "SS14.Launcher" ];
 
   desktopItems = [
@@ -123,7 +130,7 @@ buildDotnetModule rec {
 
   postInstall = ''
     mkdir -p $out/lib/space-station-14-launcher/loader
-    cp -r SS14.Loader/bin/${buildType}/*/* $out/lib/space-station-14-launcher/loader/
+    cp -r SS14.Loader/bin/${buildType}/net7.0/* $out/lib/space-station-14-launcher/loader/
 
     icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out
   '';

diff --git a/nix/wrapper.nix b/nix/wrapper.nix