From 61a20d6d64d49ec68ee4d62e44013afc9f5b24ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:07:31 +0100 Subject: [PATCH 1/3] crawl: Update repo url --- pkgs/games/crawl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b2015a28947a..c8b940a8820e 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -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"; }; From e06eb19de58bc75aee5f58eb7833f7536da7b145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:13:41 +0100 Subject: [PATCH 2/3] crawl: Add full game name to description I didn't find the game when searching for it and invested quite some time to package it myself. Having the game title in the description makes the package easier to discover. --- pkgs/games/crawl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index c8b940a8820e..392af49c38dc 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -45,9 +45,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 ]; From d7be766a050163f8fc4002866f0b3052df1d0dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Wed, 6 Feb 2019 11:17:30 +0100 Subject: [PATCH 3/3] crawl: Add option for sound support and enable it in tileMode by default --- pkgs/games/crawl/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 392af49c38dc..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 { @@ -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";