diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2018-08-11 18:22:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-11 18:22:49 +0200 |
| commit | c85748baaffb2ce9532cbc9e928e5304c72f9103 (patch) | |
| tree | 7155a445ccd8f7127b011e52f6ea2193c1e7ea9b | |
| parent | pgmanage: 10.3.0 -> 10.3.1 (diff) | |
| parent | crawl: 0.21.1 -> 0.22.0 (diff) | |
| download | nixpkgs-c85748baaffb2ce9532cbc9e928e5304c72f9103.tar.gz | |
Merge pull request #44882 from nonfreeblob/crawl-0.22.0
crawl: 0.21.1 -> 0.22.0
| -rw-r--r-- | pkgs/games/crawl/default.nix | 9 | ||||
| -rw-r--r-- | 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 c29238170a49..26fef8cb1d7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19499,7 +19499,7 @@ with pkgs; crafty = callPackage ../games/crafty { }; - crawlTiles = crawl.override { + crawlTiles = callPackage ../games/crawl { tileMode = true; }; |