public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of sqlite is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen
2016-04-16 20:47:23 +03:00
committed by Vladimír Čunát
parent 5a8ad2d7a8
commit e80e4ba2bb
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/games/crawl/crawl_purify.patch
View File

@@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644
ifndef CROSSHOST
- SQLITE_INCLUDE_DIR := /usr/include
+ SQLITE_INCLUDE_DIR := ${sqlite}/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

2
pkgs/games/crawl/default.nix
View File

@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
"SAVEDIR=~/.crawl" "sqlite=${sqlite}" ]
"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 "";