pyrox.dev
Merge pull request #90215 from catern/crawl
crawl: 0.24.1 -> 0.25.0
+14
-29
pkgs/games/crawl/crawl_purify.patch
+14
-29
pkgs/games/crawl/crawl_purify.patch
···
1
-
diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile
2
-
--- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
3
-
+++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300
4
-
@@ -224,9 +224,9 @@
5
-
STRIP := strip -x
6
-
NEED_APPKIT = YesPlease
7
-
LIBNCURSES_IS_UNICODE = Yes
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
8
- NO_PKGCONFIG = Yes
9
9
- BUILD_SQLITE = YesPlease
10
10
- BUILD_ZLIB = YesPlease
11
11
+ #NO_PKGCONFIG = Yes
12
12
+ #BUILD_SQLITE = YesPlease
13
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
-
@@ -286,13 +286,7 @@
18
-
LIBZ := contrib/install/$(ARCH)/lib/libz.a
19
-
20
-
ifndef CROSSHOST
21
-
- # FreeBSD keeps all of its userland includes in /usr/local so
22
-
- # look there
23
-
- ifeq ($(uname_S),FreeBSD)
24
-
- SQLITE_INCLUDE_DIR := /usr/local/include
25
-
- else
26
-
- SQLITE_INCLUDE_DIR := /usr/include
27
-
- endif
28
-
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
29
-
else
30
-
# This is totally wrong, works only with some old-style setups, and
31
-
# on some architectures of Debian/new FHS multiarch -- excluding, for
32
-
diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font
33
-
--- crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
34
-
+++ crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300
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
35
20
@@ -1,6 +1,6 @@
36
21
#! /bin/sh
37
22
···
59
44
+# include <SDL2/SDL_image.h>
60
45
# if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS)
61
46
# include <SDL2/SDL_mixer.h>
62
-
# endif
47
+
# endif
+2
-2
pkgs/games/crawl/default.nix
+2
-2
pkgs/games/crawl/default.nix
···
8
8
9
9
stdenv.mkDerivation rec {
10
10
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
11
-
version = "0.24.1";
11
+
version = "0.25.0";
12
12
13
13
src = fetchFromGitHub {
14
14
owner = "crawl";
15
15
repo = "crawl";
16
16
rev = version;
17
-
sha256 = "1fiizkigmbrw0nb1l1m3syl2mw4a4r36l1y0n4z8z7slp79bsbv4";
17
+
sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm";
18
18
};
19
19
20
20
# Patch hard-coded paths and remove force library builds