From c7ffb4ba0621bdd6b3d88a3c0b6abf5c9ce3159c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 24 Mar 2025 17:44:42 +0100
Subject: [PATCH] jazz2: cleanup

---
 pkgs/by-name/ja/jazz2/package.nix | 37 +++++++++++++++++--------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index d986ff7195a9..20cd5b2a058d 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -1,16 +1,16 @@
 {
-  cmake,
-  fetchFromGitHub,
-  gitUpdater,
-  jazz2-content,
   lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  jazz2-content,
   libopenmpt,
   libvorbis,
   openal,
   SDL2,
-  stdenv,
-  testers,
   zlib,
+  versionCheckHook,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "deathkiller";
     repo = "jazz2-native";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-9Fsm4hiNIEi5OVZLOLccSUkFmHnQ+ZUoBor+DZ9edVo=";
   };
 
@@ -36,24 +36,27 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DLIBOPENMPT_INCLUDE_DIR=${lib.getDev libopenmpt}/include/libopenmpt"
-    "-DNCINE_DOWNLOAD_DEPENDENCIES=OFF"
-    "-DNCINE_OVERRIDE_CONTENT_PATH=${jazz2-content}"
+    (lib.cmakeFeature "LIBOPENMPT_INCLUDE_DIR" "${lib.getDev libopenmpt}/include/libopenmpt")
+    (lib.cmakeBool "NCINE_DOWNLOAD_DEPENDENCIES" false)
+    (lib.cmakeFeature "NCINE_OVERRIDE_CONTENT_PATH" "${jazz2-content}")
   ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = gitUpdater { };
-    tests.version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source Jazz Jackrabbit 2 reimplementation";
     homepage = "https://github.com/deathkiller/jazz2-native";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "jazz2";
-    maintainers = with maintainers; [ surfaceflinger ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ surfaceflinger ];
+    platforms = lib.platforms.linux;
   };
 })