treewide: Make explicit that 'dev' output of sqlite is used
This commit is contained in:
committed by
Vladimír Čunát
parent
5a8ad2d7a8
commit
e80e4ba2bb
@@ -90,7 +90,7 @@ let
|
||||
};
|
||||
|
||||
sqlite = {
|
||||
configureFlags = ["--with-pdo-sqlite=${sqlite}"];
|
||||
configureFlags = ["--with-pdo-sqlite=${sqlite.dev}"];
|
||||
buildInputs = [ sqlite ];
|
||||
};
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -10,7 +10,7 @@ buildPerlPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ DBI ];
|
||||
|
||||
makeMakerFlags = "SQLITE_LOCATION=${sqlite}";
|
||||
makeMakerFlags = "SQLITE_LOCATION=${sqlite.dev}";
|
||||
|
||||
patches = [
|
||||
# Support building against our own sqlite.
|
||||
|
||||
@@ -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"
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user