diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-07-27 15:54:02 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-07-27 17:07:44 +0300 |
| commit | f4312a30241fd88c3b4bb38ba62999865073ad94 (patch) | |
| tree | ae3fbe49d93ba77acb744b939977ff59d7b316a4 /pkgs/games/crawl | |
| parent | 8655259bfe22b97686598345377062601480e615 (diff) | |
| download | nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar.gz nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar.bz2 nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar.lz nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar.xz nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.tar.zst nixpkgs-f4312a30241fd88c3b4bb38ba62999865073ad94.zip | |
crawl: 0.19.0 -> 0.20.1
Diffstat (limited to 'pkgs/games/crawl')
| -rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 22 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 4 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 766b633057d..808a4109f7b 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -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 ---- crawl-ref-0.19.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 -@@ -285,7 +285,7 @@ +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.20.1-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 +@@ -286,13 +286,7 @@ LIBZ := contrib/install/$(ARCH)/lib/libz.a 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 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.19.1-src-old/crawl-ref/source/util/find_font crawl-ref-0.19.1-src/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.19.1-src/crawl-ref/source/util/find_font 2016-11-23 15:39:04.044031141 +0300 +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.20.1-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 @@ -1,6 +1,6 @@ #! /bin/sh diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index b6259c033af..9d6f6b33e69 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.19.3"; + version = "0.20.1"; src = fetchFromGitHub { owner = "crawl-ref"; repo = "crawl-ref"; rev = version; - sha256 = "1qn6r5pg568pk8zgp2ijn04h4brvw675q4nxkkvzyf76ljbpzif7"; + sha256 = "1ic3prvydmw753lasrvzgndcw0k4329pnafpphfpxwvdfsmhbi26"; }; patches = [ ./crawl_purify.patch ]; |