From 3d56684d9599401573ae4ed4af19a9b28d9da886 Mon Sep 17 00:00:00 2001
From: nonfreeblob <nonfreeblob@yandex.com>
Date: Sat, 11 Aug 2018 15:00:15 +0300
Subject: [PATCH] crawl: 0.21.1 -> 0.22.0

---
 pkgs/games/crawl/default.nix    | 9 ++++-----
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index 66e199a3f0d2..b444f5b0be0f 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -5,15 +5,16 @@
 
 stdenv.mkDerivation rec {
   name = "crawl-${version}${lib.optionalString tileMode "-tiles"}";
-  version = "0.21.1";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "crawl-ref";
     repo = "crawl-ref";
     rev = version;
-    sha256 = "191pmd7vpp9qni5l13fb5s8g1axniah8a6hhi31gp0848c8n7hlh";
+    sha256 = "1bzhqrc944rgpdnnid3c5h2r3dvyw70cs70hazzm0cv5aipdkhbl";
   };
 
+  # Patch hard-coded paths in the makefile
   patches = [ ./crawl_purify.patch ];
 
   nativeBuildInputs = [ pkgconfig which perl pngcrush advancecomp ];
@@ -25,9 +26,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     cd crawl-ref/source
     echo "${version}" > util/release_ver
-    for i in util/*; do
-      patchShebangs $i
-    done
+    patchShebangs 'util'
     patchShebangs util/gen-mi-enum
     rm -rf contrib
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b15e442b28d5..6a5bb00488c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19546,7 +19546,7 @@ with pkgs;
 
   crafty = callPackage ../games/crafty { };
 
-  crawlTiles = crawl.override {
+  crawlTiles = callPackage ../games/crawl {
     tileMode = true;
   };