From 98e0716ed47722e33c0b48034b849f20e57bef2f Mon Sep 17 00:00:00 2001 From: Vivien Bakke Date: Sat, 29 Mar 2025 12:49:02 +0100 Subject: [PATCH] starsector: 0.97a-RC11 -> 0.98a-RC5 Changelog: https://fractalsoftworks.com/2025/03/27/starsector-0-98a-release/ The startup shell script had a number of changes in this one. Compiler directives were moved into a separate text file, so that needed some extra path trickery and the old replace strings removed. This also upgraded Starsector from Java 8 to 17. --- pkgs/games/starsector/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index 7733bb7077fd..4787cefc379b 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.97a-RC11"; + version = "0.98a-RC5"; src = fetchzip { url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; - sha256 = "sha256-KT4n0kBocaljD6dTbpr6xcwy6rBBZTFjov9m+jizDW4="; + sha256 = "sha256-otssjDpc4FjhTjS2A/JttlglJtMNVyDfhyTv9X+NiX0="; }; nativeBuildInputs = [ @@ -82,9 +82,8 @@ stdenv.mkDerivation rec { substituteInPlace starsector.sh \ --replace-fail "./jre_linux/bin/java" "${openjdk}/bin/java" \ --replace-fail "./native/linux" "$out/share/starsector/native/linux" \ + --replace-fail "./compiler_directives.txt" "$out/share/starsector/compiler_directives.txt" \ --replace-fail "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \ - --replace-fail "-XX:+CompilerThreadHintNoPreempt" "-XX:+UnlockDiagnosticVMOptions -XX:-BytecodeVerificationRemote -XX:+CMSConcurrentMTEnabled -XX:+DisableExplicitGC" \ - --replace-quiet " -XX:PermSize=192m -XX:MaxPermSize=192m" "" \ --replace-fail "com.fs.starfarer.StarfarerLauncher" "\"\$@\" com.fs.starfarer.StarfarerLauncher" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c5db504f242..77610828fa59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16060,7 +16060,7 @@ with pkgs; }; starsector = callPackage ../games/starsector { - openjdk = openjdk8; + openjdk = openjdk17; }; scummvm = callPackage ../games/scummvm {