From f6640842fe968516b682d9b14ca61b9745079465 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 23 Aug 2016 03:36:14 +0300 Subject: [PATCH] treewide: Make explicit that 'dev' output of sqlite is used --- pkgs/games/crawl/crawl_purify.patch | 2 +- pkgs/servers/xmpp/ejabberd/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/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 5b4a22d562e..7fc2a5f7143 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { inherit src; - configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite}" ]; + configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ]; buildInputs = [ git erlang openssl expat libyaml sqlite pam zlib elixir ];