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

crawl: 0.19.0 -> 0.20.1

Browse Source
This commit is contained in:
Nikolay Amiantov 2017-07-27 15:54:02 +03:00
parent 8655259bfe
commit f4312a3024
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,24 @@
diff -ru3 crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile crawl-ref-0.19.1-src/crawl-ref/source/Makefile diff -ru3 crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile
--- crawl-ref-0.19.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300 --- crawl-ref-0.20.1-src-old/crawl-ref/source/Makefile 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.19.1-src/crawl-ref/source/Makefile 2016-11-23 15:37:15.303077886 +0300 +++ crawl-ref-0.20.1-src-new/crawl-ref/source/Makefile 2017-07-27 14:45:34.611221571 +0300
@@ -285,7 +285,7 @@ @@ -286,13 +286,7 @@
LIBZ := contrib/install/$(ARCH)/lib/libz.a LIBZ := contrib/install/$(ARCH)/lib/libz.a
ifndef CROSSHOST ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include - # 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 + SQLITE_INCLUDE_DIR := ${sqlite}/include
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.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 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
--- crawl-ref-0.19.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300 --- crawl-ref-0.20.1-src-old/crawl-ref/source/util/find_font 1970-01-01 03:00:01.000000000 +0300
+++ crawl-ref-0.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300 +++ crawl-ref-0.20.1-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

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

@ -5,13 +5,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
version = "0.19.3"; version = "0.20.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "crawl-ref"; owner = "crawl-ref";
repo = "crawl-ref"; repo = "crawl-ref";
rev = version; rev = version;
sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7"; sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26";
}; };
patches = [ ./crawl_purify.patch ]; patches = [ ./crawl_purify.patch ];