public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cataclysm-dda-git: remove obsolete lua dependency

Browse Source
This commit is contained in:
Mitsuhiro Nakamura 2019-05-03 17:00:23 +09:00
parent c2987f1ba8
commit f7dacc3ae2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/games/cataclysm-dda/common.nix
View File

@ -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 , tiles, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, freetype, Cocoa
, debug, runtimeShell , debug, runtimeShell
}: }:
@ -6,7 +6,7 @@
let let
inherit (stdenv.lib) optionals optionalString; inherit (stdenv.lib) optionals optionalString;
cursesDeps = [ gettext lua ncurses ] cursesDeps = [ gettext ncurses ]
++ optionals stdenv.isDarwin [ CoreFoundation ]; ++ optionals stdenv.isDarwin [ CoreFoundation ];
tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ]
@ -22,7 +22,7 @@ let
''; '';
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "LUA=1" "USE_HOME_DIR=1" "LANGUAGES=all" "PREFIX=$(out)" "USE_HOME_DIR=1" "LANGUAGES=all"
] ++ optionals (!debug) [ ] ++ optionals (!debug) [
"RELEASE=1" "RELEASE=1"
] ++ optionals tiles [ ] ++ optionals tiles [

8
pkgs/games/cataclysm-dda/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, callPackage, CoreFoundation { stdenv, callPackage, lua, CoreFoundation
, tiles ? true, Cocoa , tiles ? true, Cocoa
, debug ? false , debug ? false
}: }:
@ -17,12 +17,18 @@ stdenv.mkDerivation (common // rec {
sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc";
}; };
buildInputs = common.buildInputs ++ [ lua ];
patches = [ ./patches/fix_locale_dir.patch ]; patches = [ ./patches/fix_locale_dir.patch ];
postPatch = common.postPatch + '' postPatch = common.postPatch + ''
substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share"
''; '';
makeFlags = common.makeFlags ++ [
"LUA=1"
];
meta = with stdenv.lib.maintainers; common.meta // { meta = with stdenv.lib.maintainers; common.meta // {
maintainers = common.meta.maintainers ++ [ skeidel ]; maintainers = common.meta.maintainers ++ [ skeidel ];
}; };