summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-03-06 05:06:24 +0300
committerNikolay Amiantov <ab@fmap.me>2016-03-06 05:10:20 +0300
commit0bf8a1a86df67649893726d50761567121330006 (patch)
tree4bcb13c57bd6eb208161c754e2d65ffe86c6e78b /pkgs
parentb747253700d40c0a3abcb595bdcbf102709cc4f0 (diff)
downloadnixlib-0bf8a1a86df67649893726d50761567121330006.tar
nixlib-0bf8a1a86df67649893726d50761567121330006.tar.gz
nixlib-0bf8a1a86df67649893726d50761567121330006.tar.bz2
nixlib-0bf8a1a86df67649893726d50761567121330006.tar.lz
nixlib-0bf8a1a86df67649893726d50761567121330006.tar.xz
nixlib-0bf8a1a86df67649893726d50761567121330006.tar.zst
nixlib-0bf8a1a86df67649893726d50761567121330006.zip
crawl: cleanup
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/games/crawl/default.nix4
-rw-r--r--pkgs/top-level/all-packages.nix8
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e6a1eb2c1a62..0b9287faf370 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
 , dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype
-, tileMode ? true
+, tileMode ? false
 }:
 
 let version = "0.17.1";
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
   preBuild = ''
     cd crawl-ref/source
     echo "${version}" > util/release_ver
-    # Related to issue #1963
-    sed -i 's/-fuse-ld=gold//g' Makefile
     for i in util/*; do
       patchShebangs $i
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a370802389a4..c540ff849c8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14449,12 +14449,12 @@ let
   crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
-  crawlTiles = callPackage ../games/crawl { };
-
-  crawl = callPackage ../games/crawl {
-    tileMode = false;
+  crawlTiles = crawl.override {
+    tileMode = true;
   };
 
+  crawl = callPackage ../games/crawl { };
+
   crrcsim = callPackage ../games/crrcsim {};
 
   cuyo = callPackage ../games/cuyo { };