From e70802d362a9784ce9fa152956b5ab44db5beebf Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 19 Mar 2024 10:16:57 +0100 Subject: [PATCH] domination: make deterministic and clean up --- pkgs/games/domination/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/domination/default.nix b/pkgs/games/domination/default.nix index d1647eb6a46a..232a8d7b23c8 100644 --- a/pkgs/games/domination/default.nix +++ b/pkgs/games/domination/default.nix @@ -4,6 +4,7 @@ , jdk8 , jre , ant +, stripJavaArchivesHook , makeWrapper , makeDesktopItem , copyDesktopItems @@ -41,6 +42,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ jdk8 ant + stripJavaArchivesHook makeWrapper copyDesktopItems ]; @@ -71,7 +73,6 @@ in stdenv.mkDerivation { cp -r build/game/* $out/share/domination/ # Reimplement the two launchers mentioned in Unix_shortcutSpec.xml with makeWrapper - mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/domination \ --chdir "$out/share/domination" \ --add-flags "-jar $out/share/domination/Domination.jar" @@ -83,6 +84,11 @@ in stdenv.mkDerivation { runHook postInstall ''; + preFixup = '' + # remove extra metadata files for jar files which break stripJavaArchivesHook + find $out/share/domination/lib -type f -name '._*.jar' -delete + ''; + passthru.tests = { domination-starts = nixosTests.domination; }; @@ -101,7 +107,8 @@ in stdenv.mkDerivation { fromSource binaryBytecode # source bundles dependencies as jars ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; + mainProgram = "domination"; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; };