Merge branch 'master' into staging-next

There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940

4 files changed, 132 insertions, 2 deletions

diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix
new file mode 100644
index 000000000000..8b915345f862
--- /dev/null
+++ b/pkgs/games/curseofwar/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, ncurses
+, SDL
+}:
+
+stdenv.mkDerivation rec {
+  pname = "curseofwar";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "a-nikolaev";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1bj3lv5vrnwzzkgj31pyf1lzkz10qphvzlfz7a3j4plqkczjq92y";
+  };
+
+  patches = [(fetchpatch {
+    # Pull request #40: https://github.com/a-nikolaev/curseofwar/pull/40
+    name = "prefix-independent-data";
+    url = "https://github.com/fgaz/curseofwar/commit/947dea527b2bf4c6e107b8e9c66f4c4fd775b6f9.patch";
+    sha256 = "0ak5igaxmbavkbl8101xx6gswhwgzm5f6wyplwapgh7cylnclc61";
+  })];
+
+  buildInputs = [
+    ncurses
+    SDL
+  ];
+
+  makeFlags = (if isNull SDL then [] else [ "SDL=yes" ]) ++ [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "A fast-paced action strategy game";
+    homepage = "https://a-nikolaev.github.io/curseofwar/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
index c0799e8fdf4c..dd27f96f7d40 100644
--- a/pkgs/games/galaxis/default.nix
+++ b/pkgs/games/galaxis/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "galaxis-${version}";
-  version = "1.9";
+  version = "1.10";
 
   src = fetchurl{
     url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
-    sha256 = "1dsypk5brfbc399pg4fk9myyh5yyln0ljl1aiqkypws8h4nsdphl";
+    sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r";
   };
 
   buildInputs = [ ncurses xmlto ];
diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix
new file mode 100644
index 000000000000..cf037a0f4362
--- /dev/null
+++ b/pkgs/games/toppler/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, fetchurl
+, SDL
+, SDL_mixer
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "toppler";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "0ifccissd8sh78kpwh7dafx4ah7hkhqz6nf4z2hdnalw702jkg3x";
+  };
+
+  buildInputs = [
+    SDL
+    SDL_mixer
+    zlib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Jump and run game, reimplementation of Tower Toppler/Nebulus";
+    homepage = "http://toppler.sourceforge.net/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix
new file mode 100644
index 000000000000..9d42cfd6896d
--- /dev/null
+++ b/pkgs/games/zaz/default.nix
@@ -0,0 +1,58 @@
+{ stdenv
+, fetchurl
+, pkgconfig
+, SDL
+, SDL_image
+, mesa
+, libtheora
+, libvorbis
+, libogg
+, ftgl
+, freetype
+}:
+
+stdenv.mkDerivation rec {
+  pname = "zaz";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "15q3kxzl71m50byw37dshfsx5wp240ywah19ccmqmqarcldcqcp3";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+  ];
+  buildInputs = [
+    SDL.dev
+    SDL_image
+    mesa
+    libtheora
+    libvorbis.dev
+    libogg
+    ftgl
+    freetype
+  ];
+
+  # Fix SDL include problems
+  NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL -I${SDL_image}/include/SDL";
+  # Fix linking errors
+  makeFlags = [
+    "ZAZ_LIBS+=-lSDL"
+    "ZAZ_LIBS+=-lvorbis"
+    "ZAZ_LIBS+=-ltheora"
+    "ZAZ_LIBS+=-logg"
+    "ZAZ_LIBS+=-ltheoraenc"
+    "ZAZ_LIBS+=-ltheoradec"
+    "ZAZ_LIBS+=-lvorbisfile"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A puzzle game about arranging balls in triplets, like Luxor, Zuma, or Puzzle Bobble";
+    homepage = "http://zaz.sourceforge.net/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ fgaz ];
+    platforms = platforms.all;
+  };
+}
+