diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/perl-modules/DBD-SQLite/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/global/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/crawl/crawl_purify.patch | 2 | ||||
| -rw-r--r-- | pkgs/games/crawl/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/ejabberd/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/backup/bacula/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index dec3046464d..d3573b6c962 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -46,7 +46,7 @@ let ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} --with-zlib=${zlib} - --with-sqlite=${sqlite} + --with-sqlite=${sqlite.dev} ''; preBuild = '' diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index eccc0d66c2b..18ffbe8c9a3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -90,7 +90,7 @@ let }; sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; + configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"]; buildInputs = [ sqlite ]; }; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 4f73fed34df..3740cf18b1e 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--enable-hdb-openldap-module" - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-libedit=${libedit}" "--with-openssl=${openssl.dev}" "--without-x" diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 13b633f4704..897e82c68e1 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -10,7 +10,7 @@ buildPerlPackage rec { propagatedBuildInputs = [ DBI ]; - makeMakerFlags = "SQLITE_LOCATION=${sqlite}"; + makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}"; patches = [ # Support building against our own sqlite. diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 73e5def8be1..3d09bc92cd3 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--with-ltdl-include=${libtool}/include" "--with-ltdl-lib=${libtool.lib}/lib" "--with-ncurses=${ncurses.dev}" - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-exuberant-ctags=${ctags}/bin/ctags" "--with-posix-sort=${coreutils}/bin/sort" ]; 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 ""; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 974a636e559..ef7d64b3e78 100644 --- a/pkgs/servers/xmpp/ejabberd/default.nix +++ b/pkgs/servers/xmpp/ejabberd/default.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature withIconv "iconv") (lib.enableFeature withTools "tools") (lib.enableFeature withRedis "redis") - ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}"; + ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}"; enableParallelBuilding = true; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 0b29ca1f42a..fe50468c936 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!stdenv.isDarwin) acl; configureFlags = [ - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-postgresql=${postgresql}" ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index d28c63fdcd8..8ac9bbef847 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] ++ optional (python != null) "--with-python=${python}" ++ optional (openssl != null) "--with-openssl=${openssl.dev}" - ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" ++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (zlib != null) "--with-zlib=${zlib}" |