From cc69ea38a55e0b032b1c2059ab6af9baf8ed5293 Mon Sep 17 00:00:00 2001 From: Robin Gloster <mail@glob.in> Date: Wed, 24 Aug 2016 20:15:59 +0000 Subject: [PATCH] Revert "crawl: fix build with multiple outputs" This reverts commit 5d51614620e5a891a185f155462106712ac922cc. Fixed on master already --- pkgs/games/crawl/crawl_purify.patch | 2 +- pkgs/games/crawl/default.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index eaff3d74b989..bae82bebfb7a 100644 --- a/pkgs/games/crawl/crawl_purify.patch +++ b/pkgs/games/crawl/crawl_purify.patch @@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644 ifndef CROSSHOST - SQLITE_INCLUDE_DIR := /usr/include -+ SQLITE_INCLUDE_DIR := @sqliteDev@/include ++ SQLITE_INCLUDE_DIR := ${sqlite.dev}/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 --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 18eb50b2815a..edaa3ef1fccf 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -30,12 +30,10 @@ stdenv.mkDerivation rec { patchShebangs $i done patchShebangs util/gen-mi-enum - substituteInPlace Makefile \ - --subst-var-by sqliteDev ${sqlite.dev} ''; makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++" - "SAVEDIR=~/.crawl" ] + "SAVEDIR=~/.crawl" "sqlite=${sqlite.dev}" ] ++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ]; postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";