* unixODBCDrivers needs sqlite.
svn path=/nixpkgs/trunk/; revision=12072
This commit is contained in:
parent
5a66790cce
commit
4192f35202
|
@ -1,10 +1,10 @@
|
||||||
{stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2,
|
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
|
||||||
gdbmSupport ? true, gdbm ? null
|
, gdbmSupport ? true, gdbm ? null
|
||||||
, sqlite ? null
|
, sqlite ? null
|
||||||
, db4 ? null
|
, db4 ? null
|
||||||
, readline ? null
|
, readline ? null
|
||||||
, openssl ? null
|
, openssl ? null
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert zlibSupport -> zlib != null;
|
assert zlibSupport -> zlib != null;
|
||||||
assert gdbmSupport -> gdbm != null;
|
assert gdbmSupport -> gdbm != null;
|
||||||
|
|
|
@ -3346,7 +3346,7 @@ let pkgs = rec {
|
||||||
|
|
||||||
unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
|
unixODBCDrivers = recurseIntoAttrs (import ../development/libraries/unixODBCDrivers {
|
||||||
inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
|
inherit fetchurl stdenv unixODBC glibc libtool openssl zlib;
|
||||||
inherit postgresql mysql;
|
inherit postgresql mysql sqlite;
|
||||||
});
|
});
|
||||||
|
|
||||||
wxGTK = wxGTK26;
|
wxGTK = wxGTK26;
|
||||||
|
|
Loading…
Reference in New Issue