pyrox.dev
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.
+3
-17
pkgs/games/crawl/crawl_purify.patch
+3
-17
pkgs/games/crawl/crawl_purify.patch
···
1
-
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
2
-
--- a/crawl-ref/source/Makefile
3
-
+++ b/crawl-ref/source/Makefile
4
-
@@ -248,9 +248,9 @@ ifeq ($(uname_S),Darwin)
5
-
STRIP := strip -x
6
-
NEED_APPKIT = YesPlease
7
-
LIBNCURSES_IS_UNICODE = Yes
8
-
- NO_PKGCONFIG = Yes
9
-
- BUILD_SQLITE = YesPlease
10
-
- BUILD_ZLIB = YesPlease
11
-
+ #NO_PKGCONFIG = Yes
12
-
+ #BUILD_SQLITE = YesPlease
13
-
+ #BUILD_ZLIB = YesPlease
14
-
ifdef TILES
15
-
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
16
-
BUILD_FREETYPE = YesPlease
17
diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
18
--- a/crawl-ref/source/util/find_font
19
+++ b/crawl-ref/source/util/find_font
20
@@ -1,6 +1,6 @@
···
25
26
name=$1
27
[ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
28
-
@@ -11,6 +11,6 @@
29
for dir in $FONTDIRS; do
30
[ -d "$dir" ] && echo "$dir"
31
done
···
34
| head -n1
35
} 2>/dev/null
36
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
37
--- a/crawl-ref/source/windowmanager-sdl.cc
38
+++ b/crawl-ref/source/windowmanager-sdl.cc
39
@@ -20,7 +20,7 @@
···
1
diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font
2
+
index f8b576fd63..b95c21c0a1 100755
3
--- a/crawl-ref/source/util/find_font
4
+++ b/crawl-ref/source/util/find_font
5
@@ -1,6 +1,6 @@
···
10
11
name=$1
12
[ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; }
13
+
@@ -11,6 +11,6 @@ name=$1
14
for dir in $FONTDIRS; do
15
[ -d "$dir" ] && echo "$dir"
16
done
···
19
| head -n1
20
} 2>/dev/null
21
diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc
22
+
index e29ccff507..9bf01e040a 100644
23
--- a/crawl-ref/source/windowmanager-sdl.cc
24
+++ b/crawl-ref/source/windowmanager-sdl.cc
25
@@ -20,7 +20,7 @@
+3
-2
pkgs/games/crawl/default.nix
+3
-2
pkgs/games/crawl/default.nix
···
8
9
stdenv.mkDerivation rec {
10
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
11
-
version = "0.25.1";
12
13
src = fetchFromGitHub {
14
owner = "crawl";
15
repo = "crawl";
16
rev = version;
17
-
sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b";
18
};
19
20
# Patch hard-coded paths and remove force library builds
···
45
fontsPath = lib.optionalString tileMode dejavu_fonts;
46
47
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
48
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
49
"DATADIR=${placeholder "out"}"
50
] ++ lib.optional tileMode "TILES=y"
···
8
9
stdenv.mkDerivation rec {
10
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
11
+
version = "0.26.0";
12
13
src = fetchFromGitHub {
14
owner = "crawl";
15
repo = "crawl";
16
rev = version;
17
+
sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi";
18
};
19
20
# Patch hard-coded paths and remove force library builds
···
45
fontsPath = lib.optionalString tileMode dejavu_fonts;
46
47
makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++"
48
+
"FORCE_PKGCONFIG=y"
49
"SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}"
50
"DATADIR=${placeholder "out"}"
51
] ++ lib.optional tileMode "TILES=y"