From db64ebe167c653ef2b45bc253b6367b4e70666aa Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 2 Sep 2014 02:03:54 -0700
Subject: [PATCH 1/2] Add eternity engine, a Doom port by James Haley

Eternity Engine is a limit removing port descended from BOOM
---
 pkgs/games/eternity-engine/default.nix | 29 +++++++++++++++++++++++++
 pkgs/games/eternity-engine/master.nix  | 30 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  3 +++
 3 files changed, 62 insertions(+)
 create mode 100644 pkgs/games/eternity-engine/default.nix
 create mode 100644 pkgs/games/eternity-engine/master.nix

diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix
new file mode 100644
index 00000000000..2e04c76a990
--- /dev/null
+++ b/pkgs/games/eternity-engine/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "eternity-engine-3.40.46";
+  src = fetchurl {
+    url = https://github.com/team-eternity/eternity/archive/3.40.46.tar.gz;
+    sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4";
+  };
+
+  cmakeFlags = ''
+    -DCMAKE_BUILD_TYPE=Release
+  '';
+
+  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+  mkdir -p $out/bin
+  cp source/eternity $out/bin
+  '';
+
+  meta = {
+    homepage = http://doomworld.com/eternity;
+    description = "New school Doom port by James Haley";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/games/eternity-engine/master.nix b/pkgs/games/eternity-engine/master.nix
new file mode 100644
index 00000000000..0d0f8e26b44
--- /dev/null
+++ b/pkgs/games/eternity-engine/master.nix
@@ -0,0 +1,30 @@
+{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "eternity-engine-20140902";
+  src = fetchgit {
+    url = git://github.com/team-eternity/eternity.git;
+    rev = "db21379abb33f6d92dc0e1665e527e4d49acc722";
+    sha256 = "0k54yvxqxnd60az21b734ka3myxkqb7pjmdp3klrkfwp1kl02ysc";
+  };
+
+  cmakeFlags = ''
+    -DCMAKE_BUILD_TYPE=Release
+  '';
+
+  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+  mkdir -p $out/bin
+  cp source/eternity $out/bin
+  '';
+
+  meta = {
+    homepage = http://doomworld.com/eternity;
+    description = "New school Doom port by James Haley";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ MP2E ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 901c80dc659..30f43d30059 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -993,6 +993,9 @@ let
 
   ethtool = callPackage ../tools/misc/ethtool { };
 
+  eternity = callPackage ../games/eternity-engine { };
+  eternityMaster = callPackage ../games/eternity-engine/master.nix { };
+
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };
 
   euca2ools = callPackage ../tools/virtualization/euca2ools { pythonPackages = python26Packages; };

From eb7dbf90677983f7febf251c3f286a0dc7966507 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 6 Sep 2014 16:18:23 -0700
Subject: [PATCH 2/2] Remove eternityMaster

---
 pkgs/games/eternity-engine/master.nix | 30 ---------------------------
 pkgs/top-level/all-packages.nix       |  1 -
 2 files changed, 31 deletions(-)
 delete mode 100644 pkgs/games/eternity-engine/master.nix

diff --git a/pkgs/games/eternity-engine/master.nix b/pkgs/games/eternity-engine/master.nix
deleted file mode 100644
index 0d0f8e26b44..00000000000
--- a/pkgs/games/eternity-engine/master.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchgit }:
-
-stdenv.mkDerivation rec {
-  name = "eternity-engine-20140902";
-  src = fetchgit {
-    url = git://github.com/team-eternity/eternity.git;
-    rev = "db21379abb33f6d92dc0e1665e527e4d49acc722";
-    sha256 = "0k54yvxqxnd60az21b734ka3myxkqb7pjmdp3klrkfwp1kl02ysc";
-  };
-
-  cmakeFlags = ''
-    -DCMAKE_BUILD_TYPE=Release
-  '';
-
-  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-  mkdir -p $out/bin
-  cp source/eternity $out/bin
-  '';
-
-  meta = {
-    homepage = http://doomworld.com/eternity;
-    description = "New school Doom port by James Haley";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f43d30059..2bf19ae4bab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -994,7 +994,6 @@ let
   ethtool = callPackage ../tools/misc/ethtool { };
 
   eternity = callPackage ../games/eternity-engine { };
-  eternityMaster = callPackage ../games/eternity-engine/master.nix { };
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };