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

crawl: 0.18.1 -> 0.19.1

Browse Source
This commit is contained in:
Nikolay Amiantov
2016-11-24 01:17:56 +03:00
parent d9fba1d0a3
commit 7e1d5eb17d
2 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/games/crawl/default.nix
+13 -12
View File
@@ -1,27 +1,26 @@
{ stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush
{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp
, tileMode ? false
}:
stdenv.mkDerivation rec {
name = "crawl-${version}" + (if tileMode then "-tiles" else "");
version = "0.18.1";
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.19.1";
src = fetchFromGitHub {
owner = "crawl-ref";
repo = "crawl-ref";
rev = version;
sha256 = "1cg5mxhx0lfhadls6n8avcpkjx08nqf1y085li97zqxl3gjaj64j";
sha256 = "02iklz5q5h7h27gw86ws8wk5gz1fg86jclkar05nd7zxxgiwsk96";
};
patches = [ ./crawl_purify.patch ];
nativeBuildInputs = [ pkgconfig which perl pngcrush ];
nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ];
# Still unstable with luajit
buildInputs = [ lua5_1 zlib sqlite ncurses ]
++ stdenv.lib.optionals tileMode
[ libpng SDL2 SDL2_image freetype mesa ];
++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ];
preBuild = ''
cd crawl-ref/source
@@ -33,11 +32,13 @@ stdenv.mkDerivation rec {
rm -rf contrib
'';
makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ]
++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ];
fontsPath = lib.optionalString tileMode dejavu_fonts;
postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";
makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
] ++ lib.optional tileMode "TILES=y";
postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles";
enableParallelBuilding = true;