cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #90215 from catern/crawl

Browse source 
crawl: 0.24.1 -> 0.25.0
This commit is contained in:
Lassulus 2020-08-22 13:21:06 +02:00 committed by GitHub
commit 1a6f2e6653
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
pkgs/games/crawl/crawl_purify.patch
View file

@ -1,37 +1,22 @@
diff -ru3 crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile
--- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300
@@ -224,9 +224,9 @@
STRIP := strip -x
NEED_APPKIT = YesPlease
LIBNCURSES_IS_UNICODE = Yes
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
@@ -286,13 +286,7 @@
LIBZ := contrib/install/$(ARCH)/lib/libz.a
ifndef CROSSHOST
- # FreeBSD keeps all of its userland includes in /usr/local so
- # look there
- ifeq ($(uname_S),FreeBSD)
- SQLITE_INCLUDE_DIR := /usr/local/include
- else
- SQLITE_INCLUDE_DIR := /usr/include
- endif
+ SQLITE_INCLUDE_DIR := ${sqlite}/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for
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
--- crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300
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
--- a/crawl-ref/source/util/find_font
+++ b/crawl-ref/source/util/find_font
@@ -1,6 +1,6 @@
#! /bin/sh
@ -59,4 +44,4 @@ diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmana
+# include <SDL2/SDL_image.h>
# if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS)
# include <SDL2/SDL_mixer.h>
# endif
# endif

4
pkgs/games/crawl/default.nix
View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.24.1";
version = "0.25.0";
src = fetchFromGitHub {
owner = "crawl";
repo = "crawl";
rev = version;
sha256 = "1fiizkigmbrw0nb1l1m3syl2mw4a4r36l1y0n4z8z7slp79bsbv4";
sha256 = "0swcl8cxz64yw8dl9macz8ar1ccwrkwz89j7s1f60inb5jlxifqm";
};
# Patch hard-coded paths and remove force library builds