From f7dacc3ae239155420339bb6dac52967e1ffb0a0 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 3 May 2019 17:00:23 +0900
Subject: cataclysm-dda-git: remove obsolete lua dependency

---
 pkgs/games/cataclysm-dda/common.nix  | 6 +++---
 pkgs/games/cataclysm-dda/default.nix | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'pkgs/games/cataclysm-dda')

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index 5c2d94b3c0c0..3a7b410a04bd 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gettext, lua, ncurses, CoreFoundation
+{ stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, CoreFoundation
 , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa
 , debug, runtimeShell
 }:
@@ -6,7 +6,7 @@
 let
   inherit (stdenv.lib) optionals optionalString;
 
-  cursesDeps = [ gettext lua ncurses ]
+  cursesDeps = [ gettext ncurses ]
     ++ optionals stdenv.isDarwin [ CoreFoundation ];
 
   tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ]
@@ -22,7 +22,7 @@ let
     '';
 
     makeFlags = [
-      "PREFIX=$(out)" "LUA=1" "USE_HOME_DIR=1" "LANGUAGES=all"
+      "PREFIX=$(out)" "USE_HOME_DIR=1" "LANGUAGES=all"
     ] ++ optionals (!debug) [
       "RELEASE=1"
     ] ++ optionals tiles [
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index 30e82b0e4829..84a70c275a2f 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, CoreFoundation
+{ stdenv, callPackage, lua, CoreFoundation
 , tiles ? true, Cocoa
 , debug ? false
 }:
@@ -17,12 +17,18 @@ stdenv.mkDerivation (common // rec {
     sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc";
   };
 
+  buildInputs = common.buildInputs ++ [ lua ];
+
   patches = [ ./patches/fix_locale_dir.patch ];
 
   postPatch = common.postPatch + ''
     substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share"
   '';
 
+  makeFlags = common.makeFlags ++ [
+    "LUA=1"
+  ];
+
   meta = with stdenv.lib.maintainers; common.meta // {
     maintainers = common.meta.maintainers ++ [ skeidel ];
   };
-- 
cgit v1.2.3