From 484c24b3243b07dd5ac8bb90802e8d6e0999c5bd Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Thu, 21 Dec 2017 20:53:42 +0100
Subject: [PATCH 1/4] megaglest: use fetchFromGitHub

---
 pkgs/games/megaglest/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index 3fafcfddcbf..6f61fbbd8d3 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc
+{ stdenv, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc
 , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
+, fetchFromGitHub
 }:
 let
   version = "3.9.2";
@@ -18,9 +19,11 @@ in
 stdenv.mkDerivation {
   name = "megaglest-${version}";
 
-  src = fetchgit {
-    url = "git://github.com/MegaGlest/megaglest-source";
-    rev = "refs/tags/${version}";
+  src = fetchFromGitHub {
+    owner = "MegaGlest";
+    repo = "megaglest-source";
+    rev = "${version}";
+    fetchSubmodules = true;
     sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv";
   };
 

From c400bb9fb81861a370db458c93456760a6fb05a2 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Thu, 4 Jan 2018 13:43:35 +0000
Subject: [PATCH 2/4] megaglest: 3.9.2 -> 3.13.0

---
 pkgs/games/megaglest/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index 6f61fbbd8d3..742b1e79370 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, cmake, pkgconfig, git, curl, SDL, xercesc, openal, lua, vlc
+{ stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc
 , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng
 , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib
 , fetchFromGitHub
 }:
 let
-  version = "3.9.2";
+  version = "3.13.0";
   lib-env = buildEnv {
     name = "megaglest-lib-env";
-    paths = [ SDL xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
+    paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext
       xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype
       stdenv.cc.cc glew mesa_glu wxGTK ];
   };
@@ -24,11 +24,11 @@ stdenv.mkDerivation {
     repo = "megaglest-source";
     rev = "${version}";
     fetchSubmodules = true;
-    sha256 = "1406ns1533x5678d91s2xxxv19q7r238zsaxr37c6mv5jrx7s5jv";
+    sha256 = "0fb58a706nic14ss89zrigphvdiwy5s9dwvhscvvgrfvjpahpcws";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake git curl SDL xercesc openal lua libpng libjpeg vlc wxGTK
+  buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK
     glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
 
   configurePhase = ''

From 28fe4ce07502947513a4e8dc2b77813501e35026 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Thu, 21 Dec 2017 20:56:50 +0100
Subject: [PATCH 3/4] megaglest: do not build tests

---
 pkgs/games/megaglest/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index 742b1e79370..52506275eb0 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
     glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
 
   configurePhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out -DBUILD_MEGAGLEST_TESTS=ON
+    cmake -DCMAKE_INSTALL_PREFIX=$out
   '';
 
   postInstall =  ''

From 5c8ca3de03f955ac8756caf34d40e0868b636ff1 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Thu, 21 Dec 2017 20:57:26 +0100
Subject: [PATCH 4/4] megaglest: build the map and model editors too

---
 pkgs/games/megaglest/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix
index 52506275eb0..d43904bca6c 100644
--- a/pkgs/games/megaglest/default.nix
+++ b/pkgs/games/megaglest/default.nix
@@ -32,7 +32,11 @@ stdenv.mkDerivation {
     glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ];
 
   configurePhase = ''
-    cmake -DCMAKE_INSTALL_PREFIX=$out
+    cmake -DCMAKE_INSTALL_PREFIX=$out \
+          -DBUILD_MEGAGLEST=On \
+          -DBUILD_MEGAGLEST_MAP_EDITOR=On \
+          -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=On \
+          -DBUILD_MEGAGLEST_MODEL_VIEWER=On
   '';
 
   postInstall =  ''