1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00

Revert "crawl: fix build with multiple outputs"

This reverts commit 5d51614620.

Fixed on master already
This commit is contained in:
Robin Gloster 2016-08-24 20:15:59 +00:00
parent c4ba389a9f
commit cc69ea38a5
2 changed files with 2 additions and 4 deletions

View file

@ -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

View file

@ -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 "";