From 5284416c14114a9fbeff3bf76720b9ea7c14677a Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 23 Jan 2016 02:42:51 +0100
Subject: [PATCH 1/4] vassal: new package

---
 pkgs/games/vassal/default.nix   | 35 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/games/vassal/default.nix

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
new file mode 100644
index 000000000000..bbdd11d8587f
--- /dev/null
+++ b/pkgs/games/vassal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "VASSAL-3.2.15";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/vassalengine/${name}-linux.tar.bz2";
+    sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/vassal $out/doc
+
+    cp CHANGES LICENSE README $out
+    cp -R lib/* $out/share/vassal
+    cp -R doc/* $out/doc
+
+    makeWrapper ${jre}/bin/java $out/bin/vassal \
+      --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
+      VASSAL.launch.ModuleManager"
+  '';
+
+  # Don't move doc to share/, VASSAL expects it to be in the root
+  forceShare = [ "man" "info" ];
+
+  meta = with stdenv.lib; {
+      description = "A free, open-source boardgame engine.";
+      homepage = http://www.vassalengine.org/;
+      license = licenses.lgpg21;
+      maintainers = with maintainers; [ tvestelind ];
+      platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15eac8c7b13..9f587fc4fdfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14385,6 +14385,8 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
+  vassal = callPackage ../games/vassal { };
+
   vdrift = callPackage ../games/vdrift { };
 
   vectoroids = callPackage ../games/vectoroids { };

From 2eab353a4a8dca888b21c2feef28a514eecc365f Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 23 Jan 2016 17:36:57 +0100
Subject: [PATCH 2/4] license lgpg21 -> lgpl21

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index bbdd11d8587f..c39d06408ae5 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
       description = "A free, open-source boardgame engine.";
       homepage = http://www.vassalengine.org/;
-      license = licenses.lgpg21;
+      license = licenses.lgpl21;
       maintainers = with maintainers; [ tvestelind ];
       platforms = platforms.linux;
   };

From beabacf8c75289ec4a952aa53cbe186753515ff2 Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@stormshield.eu>
Date: Mon, 1 Feb 2016 09:40:50 +0100
Subject: [PATCH 3/4] tvestelind in maintainers

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9a8e1d685ddb..d1c37e45da9e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -312,6 +312,7 @@
   tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
+  tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";

From 42627b7d5965d65fe0be0edfe841602ee492bc3d Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@stormshield.eu>
Date: Mon, 1 Feb 2016 14:00:45 +0100
Subject: [PATCH 4/4] remove period from description

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index c39d06408ae5..319453c80194 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   forceShare = [ "man" "info" ];
 
   meta = with stdenv.lib; {
-      description = "A free, open-source boardgame engine.";
+      description = "A free, open-source boardgame engine";
       homepage = http://www.vassalengine.org/;
       license = licenses.lgpl21;
       maintainers = with maintainers; [ tvestelind ];