diff options
| author | Spencer Baugh <sbaugh@catern.com> | 2021-01-23 00:27:25 -0500 |
|---|---|---|
| committer | Spencer Baugh <sbaugh@catern.com> | 2021-01-23 00:27:25 -0500 |
| commit | 0bdc35a2ed302d275709be8db46b77ce6078cb95 (patch) | |
| tree | 4be9ce3ecd9ebd7824a59f1700f9eba4721b9c9c /pkgs/games | |
| parent | b8c3cd13187937e4e391fcb1ede63fe6da55d97f (diff) | |
| download | nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar.gz nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar.bz2 nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar.lz nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar.xz nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.tar.zst nixpkgs-0bdc35a2ed302d275709be8db46b77ce6078cb95.zip | |
crawl: 0.25.1 -> 0.26.0
FORCE_PKGCONFIG was added upstream in crawl/crawl@61de54256c8, so we can drop our patch to the Makefile which does the same thing - nice! Still need the other patches since crawl/crawl#1367 isn't yet fully merged.
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 20 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 5 |
2 files changed, 6 insertions, 19 deletions
diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index dda55b09f32..8650141744d 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -1,20 +1,5 @@ -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 diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font +index f8b576fd63..b95c21c0a1 100755 --- a/crawl-ref/source/util/find_font +++ b/crawl-ref/source/util/find_font @@ -1,6 +1,6 @@ @@ -25,7 +10,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font name=$1 [ "$name" ] || { echo "Usage: $0 <fontname.ttf>" >&2; exit 100; } -@@ -11,6 +11,6 @@ +@@ -11,6 +11,6 @@ name=$1 for dir in $FONTDIRS; do [ -d "$dir" ] && echo "$dir" done @@ -34,6 +19,7 @@ diff --git a/crawl-ref/source/util/find_font b/crawl-ref/source/util/find_font | head -n1 } 2>/dev/null diff --git a/crawl-ref/source/windowmanager-sdl.cc b/crawl-ref/source/windowmanager-sdl.cc +index e29ccff507..9bf01e040a 100644 --- a/crawl-ref/source/windowmanager-sdl.cc +++ b/crawl-ref/source/windowmanager-sdl.cc @@ -20,7 +20,7 @@ diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index ec8845b7869..8d16b2fe59c 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.25.1"; + version = "0.26.0"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "0i1cvwzwmcb07ynz1nk2svprfhsgcqmagvj5jfzayvcb1a2ww23b"; + sha256 = "0g0icmhppb6f5amf5r2ksfylrlipz2cd8gd85pmd05k463nrmwqi"; }; # Patch hard-coded paths and remove force library builds @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { fontsPath = lib.optionalString tileMode dejavu_fonts; makeFlags = [ "prefix=${placeholder "out"}" "FORCE_CC=cc" "FORCE_CXX=c++" "HOSTCXX=c++" + "FORCE_PKGCONFIG=y" "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" "DATADIR=${placeholder "out"}" ] ++ lib.optional tileMode "TILES=y" |