From f4312a30241fd88c3b4bb38ba62999865073ad94 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 27 Jul 2017 15:54:02 +0300 Subject: [PATCH] crawl: 0.19.0 -> 0.20.1 --- pkgs/games/crawl/crawl_purify.patch | 22 ++++++++++++++-------- 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 766b633057d3..808a4109f7b1 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 b6259c033af8..9d6f6b33e692 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 ];