nxengine-evo: 2.6.4 -> 2.6.5-1

pkgs/by-name/nx/nxengine-evo/package.nix

@@ -2,6 +2,7 @@
   lib,
   SDL2,
   SDL2_mixer,
+  SDL2_image,
   callPackage,
   cmake,
   pkg-config,
@@ -9,40 +10,35 @@
   fetchFromGitHub,
   fetchpatch,
   libpng,
+  libjpeg,
   stdenv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nxengine-evo";
-  version = "2.6.4";
+  version = "2.6.5-1";
 
   src = fetchFromGitHub {
     owner = "nxengine";
     repo = "nxengine-evo";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-krK2b1E5JUMxRoEWmb3HZMNSIHfUUGXSpyb4/Zdp+5A=";
+    hash = "sha256-UufvtfottD9DrnjN9xhAlkNdW5Ha+vZwf/4uKDtF5ho=";
   };
 
   patches = [
-    # Fix building by adding SDL_MIXER to include path
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/1890127ec4b4b5f8d6cb0fb30a41868e95659840.patch";
-      hash = "sha256-wlsIdN2RugOo94V3qj/AzYgrs2kf0i1Iw5zNOP8WQqI=";
-    })
-    # Fix buffer overflow
-    (fetchpatch {
-      url = "https://github.com/nxengine/nxengine-evo/commit/75b8b8e3b067fd354baa903332f2a3254d1cc017.patch";
-      hash = "sha256-fZVaZAOHgFoNakOR2MfsvRJjuLhbx+5id/bcN8w/WWo=";
-    })
     # Add missing include
     (fetchpatch {
       url = "https://github.com/nxengine/nxengine-evo/commit/0076ebb11bcfec5dc5e2e923a50425f1a33a4133.patch";
       hash = "sha256-8j3fFFw8DMljV7aAFXE+eA+vkbz1HdFTMAJmk3BRU04=";
     })
+    # Update minimum CMake version to 3.10
+    (fetchpatch {
+      url = "https://github.com/nxengine/nxengine-evo/commit/7e228063441da50f65a78bf2213e85b7fceffae9.patch";
+      hash = "sha256-Vi8nE7IdvQbMDrXycw9hLsuHQwbpu1eiUTLSaIcRoUQ=";
+    })
   ];
 
   nativeBuildInputs = [
-    SDL2
     cmake
     ninja
     pkg-config
@@ -51,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     SDL2_mixer
+    SDL2_image
     libpng
+    libjpeg
   ];
 
   strictDeps = true;
@@ -64,9 +62,8 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    cd ..
     mkdir -p $out/bin/ $out/share/nxengine/
-    install bin/* $out/bin/
+    install nxengine-evo $out/bin/
   ''
   + ''
     cp -r ${finalAttrs.finalPackage.assets}/share/nxengine/data $out/share/nxengine/data
@@ -87,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib.licenses; [
       gpl3Plus
     ];
-    mainProgram = "nx";
+    mainProgram = "nxengine-evo";
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };