From 61d8e875c0f01301c7dad0809b875b2cc22d5e61 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Aug 2016 13:34:20 +0200
Subject: liquidwar: allow deprecated readdir_r for now

---
 pkgs/games/liquidwar/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/games/liquidwar')

diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index f97c0ec412f..fb1cacc3d1c 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
     libXrender libcaca cunit
   ];
 
+  NIX_CFLAGS_COMPILE="-Wno-error=deprecated-declarations";
+
   # To avoid problems finding SDL_types.h.
   configureFlags = [ "CFLAGS=-I${SDL.dev}/include/SDL" ];
 
-- 
cgit 1.4.1


From 6b527ec517515374e889cb80d37632776d30a86b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Aug 2016 13:40:38 +0200
Subject: liquidwar5: init at 5.6.4

---
 pkgs/games/liquidwar/5.nix      | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  3 +++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/games/liquidwar/5.nix

(limited to 'pkgs/games/liquidwar')

diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
new file mode 100644
index 00000000000..ac24f3bac74
--- /dev/null
+++ b/pkgs/games/liquidwar/5.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, allegro }:
+stdenv.mkDerivation rec {
+  version = "5.6.4";
+  name = "liquidwar5-${version}";
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
+    sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
+  };
+
+   buildInputs = [
+     allegro
+   ];
+
+   configureFlags = 
+     (stdenv.lib.optional stdenv.isx86_64 "--disable-asm")
+     ;
+
+   meta = with stdenv.lib; {
+     description = ''The classic version of a quick tactics game LiquidWar'';
+     maintainers = [ maintainers.raskin ];
+     license = licenses.gpl2Plus;
+     platforms = platforms.linux;
+   };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5c5b3f73ba..b103bb20f8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15810,6 +15810,9 @@ in
     guile = guile_1_8;
   };
 
+  liquidwar5 = callPackage ../games/liquidwar/5.nix {
+  };
+
   macopix = callPackage ../games/macopix {
     gtk = gtk2;
   };
-- 
cgit 1.4.1