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

Merge pull request #110566 from catern/crawl

Browse Source 
crawl: 0.25.1 -> 0.26.0
This commit is contained in:
Sandro 2021-01-23 14:44:11 +01:00 committed by GitHub
commit 4317c59eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/games/crawl/crawl_purify.patch
View File

@ -1,20 +1,5 @@
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin)
STRIP := strip -x
NEED_APPKIT = YesPlease
LIBNCURSES_IS_UNICODE = Yes
- NO_PKGCONFIG = Yes
- BUILD_SQLITE = YesPlease
- BUILD_ZLIB = YesPlease
+ #NO_PKGCONFIG = Yes
+ #BUILD_SQLITE = YesPlease
+ #BUILD_ZLIB = YesPlease
ifdef TILES
EXTRA_LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL -framework AudioToolbox -framework CoreVideo contrib/install/$(ARCH)/lib/libSDL2main.a
BUILD_FREETYPE = YesPlease
diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
index f8b576fd63..b95c21c0a1 100755
--- a/crawl-ref/source/util/find_font --- a/crawl-ref/source/util/find_font
+++ b/crawl-ref/source/util/find_font +++ b/crawl-ref/source/util/find_font
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -25,7 +10,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
name=$1 name=$1
[ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; } [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@ name=$1
for dir in $FONTDIRS; do for dir in $FONTDIRS; do
[ -d "$dir" ] && echo "$dir" [ -d "$dir" ] && echo "$dir"
done done
@ -34,6 +19,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
| head -n1 | head -n1
} 2>/dev/null } 2>/dev/null
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
index e29ccff507..9bf01e040a 100644
--- a/crawl-ref/source/windowmanager-sdl.cc --- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc +++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@

5
pkgs/games/crawl/default.nix
View File

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.25.1"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crawl"; owner = "crawl";
repo = "crawl"; repo = "crawl";
rev = version; rev = version;
sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi";
}; };
# Patch hard-coded paths and remove force library builds # Patch hard-coded paths and remove force library builds
@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
fontsPath = lib.optionalString tileMode dejavu_fonts; fontsPath = lib.optionalString tileMode dejavu_fonts;
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
"FORCE_PKGCONFIG=y"
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
"DATADIR=${placeholder "out"}" "DATADIR=${placeholder "out"}"
] ++ lib.optional tileMode "TILES=y" ] ++ lib.optional tileMode "TILES=y"