summary refs log tree commit diff
path: root/pkgs/development/libraries/sqlite
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-24 11:38:52 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-10-24 11:54:52 +0200
commitb4db4db322825ab3b5d7c0f0737620e928f40369 (patch)
treef239757c7300497fe357b3e17d0b6c84eff78eab /pkgs/development/libraries/sqlite
parent9e1ab43459d37ec3e5244837e43de4a162cbdfa0 (diff)
downloadnixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar.gz
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar.bz2
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar.lz
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar.xz
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.tar.zst
nixpkgs-b4db4db322825ab3b5d7c0f0737620e928f40369.zip
sqlite: Update to 3.8.7
Diffstat (limited to 'pkgs/development/libraries/sqlite')
-rw-r--r--pkgs/development/libraries/sqlite/default.nix13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index a460db82b7f..0baa72993ba 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }:
 
-assert readline != null -> ncurses != null;
+assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.6";
+  name = "sqlite-3.8.7";
 
   src = fetchurl {
-    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz";
-    sha1 = "c4b2911bc4a6e1dc2b411aa21d8c4f524113eb64";
+    url = "http://www.sqlite.org/2014/sqlite-autoconf-3080700.tar.gz";
+    sha1 = "8b773b006db46f3ffcbabe065e927823d13bf5c0";
   };
 
-  buildInputs = [ readline ncurses ];
+  buildInputs = lib.optionals interactive [ readline ncurses ];
 
   configureFlags = "--enable-threadsafe";
 
   CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1";
-  LDFLAGS = if readline != null then "-lncurses" else "";
 
   meta = {
     homepage = http://www.sqlite.org/;