Merge pull request #19606 from wmertens/sqlite-3.15

sqlite3: 3.14.1 -> 3.15.0
This commit is contained in:
Wout Mertens 2016-10-23 19:13:29 +02:00 committed by GitHub
commit 795f968b17

View File

@ -3,11 +3,11 @@
assert interactive -> readline != null && ncurses != null;
stdenv.mkDerivation {
name = "sqlite-3.14.1";
name = "sqlite-3.15.0";
src = fetchurl {
url = "http://sqlite.org/2016/sqlite-autoconf-3140100.tar.gz";
sha256 = "19j73j44akqgc6m82wm98yvnmm3mfzmfqr8mp3n7n080d53q4wdw";
url = "http://sqlite.org/2016/sqlite-autoconf-3150000.tar.gz";
sha256 = "09zdipkrvavlbw9dj4kwnii0z1b20rljn9fmfxz6scx0njljs5kp";
};
outputs = [ "bin" "dev" "out" ];
@ -24,6 +24,7 @@ stdenv.mkDerivation {
"-DSQLITE_ENABLE_FTS3_PARENTHESIS"
"-DSQLITE_ENABLE_FTS3_TOKENIZER"
"-DSQLITE_ENABLE_FTS4"
"-DSQLITE_ENABLE_FTS5"
"-DSQLITE_ENABLE_RTREE"
"-DSQLITE_ENABLE_STMT_SCANSTATUS"
"-DSQLITE_ENABLE_UNLOCK_NOTIFY"
@ -46,6 +47,9 @@ stdenv.mkDerivation {
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DUSE_PREAD64 -D_LARGEFILE64_SOURCE"
fi
# Necessary for FTS5 on Linux
export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
echo ""
echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
echo ""