From c4b869efc5e2e82a794d72d26d2fb35f03ece6e9 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Fri, 11 Sep 2020 14:41:55 -0300
Subject: [PATCH] openmsx: 0.15.0 -> 16.0

---
 .../openmsx/{custom-nixos.mk => custom-nix.mk} |  0
 pkgs/misc/emulators/openmsx/default.nix        | 18 ++++++++----------
 pkgs/top-level/all-packages.nix                |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)
 rename pkgs/misc/emulators/openmsx/{custom-nixos.mk => custom-nix.mk} (100%)

diff --git a/pkgs/misc/emulators/openmsx/custom-nixos.mk b/pkgs/misc/emulators/openmsx/custom-nix.mk
similarity index 100%
rename from pkgs/misc/emulators/openmsx/custom-nixos.mk
rename to pkgs/misc/emulators/openmsx/custom-nix.mk
diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix
index f0ab48aa6258..dc533c4f17ce 100644
--- a/pkgs/misc/emulators/openmsx/default.nix
+++ b/pkgs/misc/emulators/openmsx/default.nix
@@ -2,21 +2,19 @@
 , python
 , alsaLib, glew, libGL, libpng
 , libogg, libtheora, libvorbis
-, SDL, SDL_image, SDL_ttf
+, SDL2, SDL2_image, SDL2_ttf
 , freetype, tcl, zlib
 }:
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
-
   pname = "openmsx";
-  version = "0.15.0";
+  version = "16.0";
 
   src = fetchFromGitHub {
     owner = "openMSX";
     repo = "openMSX";
-    rev = "RELEASE_0_15_0";
-    sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l";
+    rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}";
+    sha256 = "04sphn9ph378r0qv881riv90cgz58650jcqcwmi1mv6gbcb3img5";
     fetchSubmodules = true;
   };
 
@@ -24,10 +22,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ alsaLib glew libGL libpng
     libogg libtheora libvorbis freetype
-    SDL SDL_image SDL_ttf tcl zlib ];
+    SDL2 SDL2_image SDL2_ttf tcl zlib ];
 
   postPatch = ''
-    cp ${./custom-nixos.mk} build/custom.mk
+    cp ${./custom-nix.mk} build/custom.mk
   '';
 
   dontAddPrefix = true;
@@ -36,8 +34,8 @@ stdenv.mkDerivation rec {
   # for providing support to Nixpkgs :)
   TCL_CONFIG="${tcl}/lib/";
 
-  meta = {
-    description = "A MSX emulator";
+  meta = with stdenv.lib;{
+    description = "The MSX emulator that aims for perfection";
     longDescription = ''
       OpenMSX is an emulator for the MSX home computer system. Its goal is
       to emulate all aspects of the MSX with 100% accuracy.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91d9790fca8e..71b69ad42635 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27664,7 +27664,7 @@ in
   snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { };
 
   openmsx = callPackage ../misc/emulators/openmsx {
-    python = python27;
+    python = python3;
   };
 
   higan = callPackage ../misc/emulators/higan {