6 files changed, 76 insertions, 5 deletions
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index beb2bb579089..a4f296da0390 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -2,6 +2,7 @@
 , pkgconfig, SDL2, SDL2_mixer }:
 
 let
+  year = "2015";
   date = "20150420";
   rev = "5160";
 in stdenv.mkDerivation rec {
@@ -9,7 +10,7 @@ in stdenv.mkDerivation rec {
   version = "${date}-${rev}";
 
   src = fetchurl {
-    url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz";
+    url = "http://dukeworld.duke4.net/eduke32/synthesis/old/${year}/${version}/eduke32_src_${version}.tar.xz";
     sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v";
   };
 
diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix
index 562df3ac1b60..64522e568db6 100644
--- a/pkgs/games/keen4/default.nix
+++ b/pkgs/games/keen4/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, dosbox, unzip}:
+{ lib, stdenv, fetchurl, dosbox, unzip }:
 
 stdenv.mkDerivation {
   name = "keen4";
@@ -15,5 +15,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Commander Keen Episode 4: Secret of the Oracle";
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix
index b666ac2ecca8..c79c06804100 100644
--- a/pkgs/games/openra/default.nix
+++ b/pkgs/games/openra/default.nix
@@ -12,7 +12,6 @@ in stdenv.mkDerivation rec {
     homepage    = "http://www.open-ra.org/";
     license     = licenses.gpl3;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchurl {
diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix
index ff4f370f04a6..faeb11c37812 100644
--- a/pkgs/games/performous/default.nix
+++ b/pkgs/games/performous/default.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation {
     homepage    = "http://performous.org/";
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ iyzsong ];
   };
 
   src = fetchFromGitHub {
diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix
new file mode 100644
index 000000000000..ac6fdee1f6b5
--- /dev/null
+++ b/pkgs/games/rimshot/default.nix
@@ -0,0 +1,62 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "rimshot";
+  version = "1.0";
+
+  icon = fetchurl {
+    url = "http://stabyourself.net/images/screenshots/rimshot-2.png";
+    sha256 = "08fyiqym3gcpq2vgb5dvafkban42fsbzfcr3iiyw03hz99q53psd";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "rimshot";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Create your own music";
+    desktopName = "Rimshot";
+    genericName = "rimshot";
+    categories = "Audio;AudioVideo;Music";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
+    sha256 = "08pdkyvki92549605m9bqnr24ipkbwkp5nkr5aagdqnr8ai4rgmi";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ lua love ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    unzip -j $src
+  '';  
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v ./*.love $out/share/games/lovegames/${pname}.love
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Create your own music";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://stabyourself.net/rimshot/;
+  };
+
+}
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 0ec52cc58043..c4dc96a4c4df 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, nasm
+{ stdenv, lib, fetchpatch, fetchFromGitHub, cmake, nasm
 , gtk2, glib, ffmpeg, alsaLib, libmad, libogg, libvorbis
 , glew, libpulseaudio
 }:
@@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
   ];
 
+  patches = [
+    # Fix compilation on i686
+    (fetchpatch {
+      url = "https://github.com/stepmania/stepmania/commit/f1e114aa03c90884946427bb43a75badec21f163.patch";
+      sha256 = "1cm14w92dilqvlyqfffiihf09ra97hxzgfal5gx08brc3j1yyzdw";
+    })
+  ];
+
   postInstall = ''
     mkdir -p $out/bin
     ln -s $out/stepmania-5.0/stepmania $out/bin/stepmania