Merge pull request #55324 from Moredread/crawl

crawl: A few improvements
This commit is contained in:
Matthew Bauer 2019-02-08 17:28:09 -05:00 committed by GitHub
commit 1eb0d79c6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp
, tileMode ? false , tileMode ? false, enableSound ? tileMode
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
version = "0.22.1"; version = "0.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crawl-ref"; owner = "crawl";
repo = "crawl-ref"; repo = "crawl";
rev = version; rev = version;
sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr";
}; };
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
# Still unstable with luajit # Still unstable with luajit
buildInputs = [ lua5_1 zlib sqlite ncurses ] buildInputs = [ lua5_1 zlib sqlite ncurses ]
++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]; ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]
++ lib.optional enableSound SDL2_mixer;
preBuild = '' preBuild = ''
cd crawl-ref/source cd crawl-ref/source
@ -35,7 +36,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
] ++ lib.optional tileMode "TILES=y"; ] ++ lib.optional tileMode "TILES=y"
++ lib.optional enableSound "SOUND=y";
postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles"; postInstall = lib.optionalString tileMode "mv $out/bin/crawl $out/bin/crawl-tiles";
@ -45,9 +47,10 @@ stdenv.mkDerivation rec {
description = "Open-source, single-player, role-playing roguelike game"; description = "Open-source, single-player, role-playing roguelike game";
homepage = http://crawl.develz.org/; homepage = http://crawl.develz.org/;
longDescription = '' longDescription = ''
Open-source, single-player, role-playing roguelike game of exploration and Dungeon Crawl: Stone Soup, an open-source, single-player, role-playing
treasure-hunting in dungeons filled with dangerous and unfriendly monsters roguelike game of exploration and treasure-hunting in dungeons filled
in a quest to rescue the mystifyingly fabulous Orb of Zot. with dangerous and unfriendly monsters in a quest to rescue the
mystifyingly fabulous Orb of Zot.
''; '';
platforms = platforms.linux; platforms = platforms.linux;
license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ]; license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ];