diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 2f5ed3f5d427..c947edb3d2b5 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,31 +1,14 @@ -{stdenv, fetchurl, readline, tcl, static ? false}: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sqlite-3.6.19"; + name = "sqlite-3.6.22"; - # Note: don't use the "amalgamation" source release, since it - # doesn't install sqlite3.pc. src = fetchurl { - url = "http://www.sqlite.org/${name}.tar.gz"; - sha256 = "7d8649c44fb97b874aa59144faaeb2356ec1fc6a8a7baa1d16e9ff5f1e097003"; + url = "http://www.sqlite.org/sqlite-amalgamation-3.6.22.tar.gz"; + sha256 = "1k5qyl0v2y4fpkh7vvxvb0irpnl71g0ffhfc3ksm40mrhcdq9qk8"; }; - buildInputs = [readline tcl]; - - configureFlags = '' - CFLAGS=-O3 - --enable-load-extension - ${if static then "--disable-shared --enable-static" else ""} - --enable-amalgamation - --enable-threadsafe - --disable-cross-thread-connections - --disable-tcl - --disable-tempstore - --with-readline-inc=-I${readline}/include - ''; - NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1"; - NIX_CFLAGS_LINK = "-ldl"; # needed for --enable-load-extension meta = { homepage = http://www.sqlite.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d23a8ae569aa..995ecf4d7b04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4674,7 +4674,7 @@ let }; sqlite = import ../development/libraries/sqlite { - inherit fetchurl stdenv readline tcl; + inherit fetchurl stdenv; }; stlport = import ../development/libraries/stlport {