Merge remote-tracking branch 'origin/master' into staging.

2 files changed, 39 insertions, 0 deletions

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index 3ddbbbdc5bf8..6536d83183cd 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -23,6 +23,9 @@ cabal.mkDerivation (self: {
     unorderedContainers vector vectorBinaryInstances zlib
   ];
   doCheck = false;
+  patchPhase = ''
+    sed -i -e 's|gtk >=.*|gtk|' LambdaHack.cabal
+  '';
   meta = {
     homepage = "http://github.com/LambdaHack/LambdaHack";
     description = "A roguelike game engine in early development";
diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix
new file mode 100644
index 000000000000..a2897a795e84
--- /dev/null
+++ b/pkgs/games/astromenace/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, cmake, x11, mesa, SDL, openal, freealut, libogg, libvorbis }:
+
+stdenv.mkDerivation rec {
+  version = "1.3.2";
+  name = "astromenace-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/openastromenace/astromenace-src-${version}.tar.bz2";
+    sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv";
+  };
+
+  buildInputs = [ cmake x11 mesa SDL openal freealut libogg libvorbis ];
+
+  buildPhase = ''
+    cmake ./
+    make
+    ./AstroMenace --pack --rawdata=../RAW_VFS_DATA
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    cp AstroMenace $out
+    cp gamedata.vfs $out
+    cat > $out/bin/AstroMenace << EOF 
+    #!/bin/bash
+    $out/AstroMenace --dir=$out
+    EOF
+    chmod 755 $out/bin/AstroMenace
+  '';
+
+  meta = {
+    description = "Hardcore 3D space shooter with spaceship upgrade possibilities.";
+    homepage = http://www.viewizard.com/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}