diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b2015a28947a..8966623e2b82 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp -, tileMode ? false +, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp +, tileMode ? false, enableSound ? tileMode }: stdenv.mkDerivation rec { @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { version = "0.22.1"; src = fetchFromGitHub { - owner = "crawl-ref"; - repo = "crawl-ref"; + owner = "crawl"; + repo = "crawl"; rev = version; sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; }; @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { # Still unstable with luajit 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 = '' cd crawl-ref/source @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" "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"; @@ -45,9 +47,10 @@ stdenv.mkDerivation rec { description = "Open-source, single-player, role-playing roguelike game"; homepage = http://crawl.develz.org/; longDescription = '' - Open-source, single-player, role-playing roguelike game of exploration and - treasure-hunting in dungeons filled with dangerous and unfriendly monsters - in a quest to rescue the mystifyingly fabulous Orb of Zot. + Dungeon Crawl: Stone Soup, an open-source, single-player, role-playing + roguelike game of exploration and treasure-hunting in dungeons filled + with dangerous and unfriendly monsters in a quest to rescue the + mystifyingly fabulous Orb of Zot. ''; platforms = platforms.linux; license = with licenses; [ gpl2Plus bsd2 bsd3 mit licenses.zlib cc0 ];