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

crawl: 0.22.1 -> 0.23.2 (#59246)

Browse Source 
PyYAML added as a new dependency.
This commit is contained in:
lightbulbjim 2019-04-12 06:34:04 +10:00 committed by xeji
parent c73e35a9b4
commit fd45865b2e
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 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.20.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 --- crawl-ref-0.23.2-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300 +++ crawl-ref-0.23.2-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300
@@ -286,13 +286,7 @@ @@ -286,13 +286,7 @@
LIBZ := contrib/install/$(ARCH)/lib/libz.a LIBZ := contrib/install/$(ARCH)/lib/libz.a
@ -16,9 +16,9 @@ diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-sr
else else
# This is totally wrong, works only with some old-style setups, and # This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for # on some architectures of Debian/new FHS multiarch -- excluding, for
diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font 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.20.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 --- crawl-ref-0.23.2-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.20.1-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300 +++ crawl-ref-0.23.2-src-new/crawl-ref/source/util/find_font 2017-07-27 14:44:29.784235540 +0300
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
@ -35,3 +35,15 @@ diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.2
+ } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \ + } | xargs -I% find -L % \( -type f -o -type l \) -iname "$name" -print \
| 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
--- a/crawl-ref/source/windowmanager-sdl.cc
+++ b/crawl-ref/source/windowmanager-sdl.cc
@@ -20,7 +20,7 @@
# else
# include <SDL2/SDL.h>
# endif
-# include <SDL_image.h>
+# include <SDL2/SDL_image.h>
# if defined(USE_SOUND) && !defined(WINMM_PLAY_SOUNDS)
# include <SDL2/SDL_mixer.h>
# endif

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

@ -1,17 +1,17 @@
{ stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, python3, zlib, pkgconfig, ncurses
, dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp , dejavu_fonts, libpng, SDL2, SDL2_image, SDL2_mixer, libGLU_combined, freetype, pngcrush, advancecomp
, tileMode ? false, enableSound ? tileMode , tileMode ? false, enableSound ? tileMode
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.22.1"; version = "0.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crawl"; owner = "crawl";
repo = "crawl"; repo = "crawl";
rev = version; rev = version;
sha256 = "19yzl241glv2zazifgz59bw3jlh4hj59xx5w002hnh9rp1w15rnr"; sha256 = "1d6mip4rvp81839yf2xm63hf34aza5wg4g5z5hi5275j94szaacs";
}; };
# Patch hard-coded paths in the makefile # Patch hard-coded paths in the makefile
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
# Still unstable with luajit # Still unstable with luajit
buildInputs = [ lua5_1 zlib sqlite ncurses ] buildInputs = [ lua5_1 zlib sqlite ncurses ]
++ (with python3.pkgs; [ pyyaml ])
++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ] ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]
++ lib.optional enableSound SDL2_mixer; ++ lib.optional enableSound SDL2_mixer;