diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:47:23 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:04:34 +0200 |
| commit | e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7 (patch) | |
| tree | a5dd9252668895ccfc4f84899f9afcab9eb28829 /pkgs/games/crawl | |
| parent | 5a8ad2d7a8a8a6c69f72e9404b63b1607fb2e88c (diff) | |
| download | nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar.gz nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar.bz2 nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar.lz nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar.xz nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.tar.zst nixpkgs-e80e4ba2bbc5fd6e491e47ad7264eead075dd2d7.zip | |
treewide: Make explicit that 'dev' output of sqlite is used
Diffstat (limited to 'pkgs/games/crawl')
| -rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 2 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch index 0e2d335adac..bae82bebfb7 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 := ${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 diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 0b9287faf37..26603e377f0 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -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 ""; |