diff options
| author | Spencer Baugh <sbaugh@catern.com> | 2021-01-23 00:27:25 -0500 |
|---|---|---|
| committer | Spencer Baugh <sbaugh@catern.com> | 2021-01-23 00:27:25 -0500 |
| commit | 0bdc35a2ed302d275709be8db46b77ce6078cb95 (patch) | |
| tree | 4be9ce3ecd9ebd7824a59f1700f9eba4721b9c9c /pkgs/games/crawl/default.nix | |
| parent | b8c3cd13187937e4e391fcb1ede63fe6da55d97f (diff) | |
crawl: 0.25.1 -> 0.26.0
FORCE_PKGCONFIG was added upstream in crawl/crawl@61de54256c8, so we can drop our patch to the Makefile which does the same thing - nice! Still need the other patches since crawl/crawl#1367 isn't yet fully merged.
Diffstat (limited to 'pkgs/games/crawl/default.nix')
| -rw-r--r-- | pkgs/games/crawl/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index ec8845b7869b1..8d16b2fe59cca 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; + sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; }; # Patch hard-coded paths and remove force library builds @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" ] ++ lib.optional tileMode "TILES=y" |