From 9a175a002d2f3611a190669d45395a9524eed32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 1 Apr 2013 17:52:57 +0200
Subject: [PATCH 1/3] openal-soft: update to 1.15.1

---
 pkgs/development/libraries/openal-soft/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 59851eda25aa..b9b08433a626 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, cmake, alsaLib }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
 #The current release is still in a testing phase, though it should be stable
 # (neither the ABI or API will break). Please try it out and let me know how it
 #  works. :-)
 
-  name = "openal-soft-1.1.93";
+  version = "1.15.1";
+  name = "openal-soft-${version}";
 
   src = fetchurl {
-    url = http://kcat.strangesoft.net/openal-releases/openal-soft-1.1.93.tar.bz2;
-    sha256 = "162nyv4jy6qzi7s5q3wpdawfph6npyn1n4wjf21haxdxq0mmp6l7";
+    url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
+    sha256 = "0mmhdqiyb3c9dzvxspm8h2v8jibhi8pfjxnf6m0wn744y1ia2a8f";
   };
 
   buildInputs = [ cmake alsaLib ];

From 8f2662d4800fb55d175075cc5610b0baaae719d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 1 Apr 2013 17:56:34 +0200
Subject: [PATCH 2/3] dhewm3: add current master from github

This is a port of the Doom 3 source code released under GPL. Amongst others,
this makes use of SDL to be multiplatform, and supports amd64.
---
 pkgs/games/dhewm3/default.nix   | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/games/dhewm3/default.nix

diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
new file mode 100644
index 000000000000..67e840d8862d
--- /dev/null
+++ b/pkgs/games/dhewm3/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, unzip, cmake, SDL, zlib, libjpeg, libogg, libvorbis
+, openalSoft , curl }:
+
+stdenv.mkDerivation rec {
+  hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
+  name = "dhewm3-20130113-${hash}";
+  src = fetchurl {
+    url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
+    sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
+    #name  = "dhewm-dhewm3-92a4132.zip";
+  };
+
+  unpackPhase = ''
+    unzip ${src}
+    cd */neo
+  '';
+
+  buildInputs = [ unzip cmake SDL zlib libjpeg libogg libvorbis openalSoft
+    curl ];
+
+  meta = {
+    homepage = https://github.com/dhewm/dhewm3;
+    description = "Doom 3 port to SDL";
+    license = "GPLv3";
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32646212ad77..f9e0043eeaec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8202,6 +8202,8 @@ let
 
   crrcsim = callPackage ../games/crrcsim {};
 
+  dhewm3 = callPackage ../games/dhewm3 {};
+
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
   dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { };

From 1717b494bf3bd69ae187e7758992e0ed99906c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 2 Apr 2013 22:52:50 +0200
Subject: [PATCH 3/3] dhewm3: add mesa to build inputs

I also removed an unused line I left over in previous commits.
---
 pkgs/games/dhewm3/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix
index 67e840d8862d..38b9f35e488c 100644
--- a/pkgs/games/dhewm3/default.nix
+++ b/pkgs/games/dhewm3/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, unzip, cmake, SDL, zlib, libjpeg, libogg, libvorbis
-, openalSoft , curl }:
+{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis
+, openalSoft, curl }:
 
 stdenv.mkDerivation rec {
   hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b";
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://github.com/dhewm/dhewm3/zipball/${hash}";
     sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd";
-    #name  = "dhewm-dhewm3-92a4132.zip";
   };
 
   unpackPhase = ''
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
     cd */neo
   '';
 
-  buildInputs = [ unzip cmake SDL zlib libjpeg libogg libvorbis openalSoft
+  buildInputs = [ unzip cmake SDL mesa zlib libjpeg libogg libvorbis openalSoft
     curl ];
 
   meta = {