diff --git a/modules/satisfactory-dedicated-server/default.nix b/modules/satisfactory-dedicated-server/default.nix index 9583ab5..7871b8d 100644 --- a/modules/satisfactory-dedicated-server/default.nix +++ b/modules/satisfactory-dedicated-server/default.nix @@ -231,10 +231,6 @@ in { "acme-finished-${cfg.useACMEHost}.target" ]; - environment = { - "LD_LIBRARY_PATH" = "${cfg.directory}/server/linux64"; - }; - unitConfig = { RequiresMountsFor = cfg.directory; }; @@ -266,7 +262,7 @@ in { "${cfg.directory}:ro" ]; BindReadOnlyPaths = [ - "${cfg.package}:${cfg.directory}/server" + "${cfg.package}/opt:${cfg.directory}/server" ]; BindPaths = [ "${cfg.directory}/saves:${cfg.directory}/.config/Epic" diff --git a/pkgs/games/satisfactory-dedicated-server/default.nix b/pkgs/games/satisfactory-dedicated-server/default.nix index 8504a09..ec161a4 100644 --- a/pkgs/games/satisfactory-dedicated-server/default.nix +++ b/pkgs/games/satisfactory-dedicated-server/default.nix @@ -7,7 +7,7 @@ }: let appId = "1690800"; - buildId = "19234106"; + buildId = "19876517"; steamworks_sdk = fetchFromSteam { name = "steamworks-sdk"; inherit appId; @@ -22,9 +22,9 @@ let inherit appId; depot = { depotId = "1690802"; - manifestId = "5693629351763493998"; + manifestId = "7620210706575413121"; }; - hash = "sha256-0svLwO4JYKIPwoNCRfT9+pocZ0n1QpSEqP41DdUhEac="; + hash = "sha256-jQbtHSBFCDcdycrDjIJBY4DGV7EgITvwv3k3+htZ7io="; }; in stdenv.mkDerivation { pname = "satisfactory-dedicated-server"; @@ -36,15 +36,15 @@ in stdenv.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out - cp -r . $out/. - cp -r ${steamworks_sdk}/linux64 $out + mkdir -p $out/opt + cp -r . $out/opt/. + cp -r ${steamworks_sdk}/linux64 $out/opt - mkdir -p $out/FactoryGame/Intermediate - mkdir -p $out/FactoryGame/Saved - mkdir -p $out/FactoryGame/Certificates + mkdir -p $out/opt/FactoryGame/Intermediate + mkdir -p $out/opt/FactoryGame/Saved + mkdir -p $out/opt/FactoryGame/Certificates - rm $out/FactoryServer.sh + rm $out/opt/FactoryServer.sh ''; dontStrip = true; @@ -55,21 +55,23 @@ in stdenv.mkDerivation { preFixup = '' echo patching binaries - chmod +x $out/Engine/Binaries/Linux/FactoryServer-Linux-Shipping + chmod +x $out/opt/Engine/Binaries/Linux/FactoryServer-Linux-Shipping patchelf \ --add-needed ${SDL2}/lib/libSDL2-2.0.so.0 \ - $out/linux64/steamclient.so + $out/opt/linux64/steamclient.so patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --add-needed $out/linux64/steamclient.so \ - $out/Engine/Binaries/Linux/FactoryServer-Linux-Shipping + --add-needed $out/opt/linux64/steamclient.so \ + $out/opt/Engine/Binaries/Linux/FactoryServer-Linux-Shipping ''; meta = with lib; { description = "Satisfactory Dedicated Server"; + homepage = "https://www.satisfactorygame.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; }; }