3
0
Fork 0
forked from mirrors/nixpkgs

crawl: fix build with multiple outputs

This commit is contained in:
Robin Gloster 2016-08-24 19:06:00 +00:00
parent 0e1b611a5b
commit 5d51614620
2 changed files with 4 additions and 2 deletions

View file

@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_INCLUDE_DIR := ${sqlite.dev}/include
+ SQLITE_INCLUDE_DIR := @sqliteDev@/include
else
# This is totally wrong, works only with some old-style setups, and
# on some architectures of Debian/new FHS multiarch -- excluding, for

View file

@ -30,10 +30,12 @@ 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" "sqlite=${sqlite.dev}" ]
"SAVEDIR=~/.crawl" ]
++ stdenv.lib.optionals tileMode [ "TILES=y" "dejavu_fonts=${dejavu_fonts}" ];
postInstall = if tileMode then "mv $out/bin/crawl $out/bin/crawl-tiles" else "";