diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2016-10-23 19:13:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-23 19:13:29 +0200 |
| commit | 795f968b17bca52f2e16ce16c4534c8a12cf85d8 (patch) | |
| tree | e6705a1826bd89723ad99bf70c49b715ce7eeaa5 | |
| parent | 6d1bf921fa8bc9049e88ec6e49834192f7b79aa5 (diff) | |
| parent | b16c240ca7f9313e39d0634f9e20beb2848df2d8 (diff) | |
| download | nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar.gz nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar.bz2 nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar.lz nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar.xz nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.tar.zst nixpkgs-795f968b17bca52f2e16ce16c4534c8a12cf85d8.zip | |
Merge pull request #19606 from wmertens/sqlite-3.15
sqlite3: 3.14.1 -> 3.15.0
| -rw-r--r-- | pkgs/development/libraries/sqlite/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 38eb1a06284..c557de1f39f 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -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 "" |