sqlite: Update to 3.8.7

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/;

pkgs/top-level/all-packages.nix

@@ -6674,14 +6674,9 @@ let
 
   srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { };
 
-  sqlite = lowPrio (callPackage ../development/libraries/sqlite {
-    readline = null;
-    ncurses = null;
-  });
+  sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
-  sqliteInteractive = appendToName "interactive" (sqlite.override {
-    inherit readline ncurses;
-  });
+  sqliteInteractive = appendToName "interactive" (sqlite.override { interactive = true; });
 
   sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
     readline = null;