diff options
author | Will Dietz <w@wdtz.org> | 2018-05-27 00:43:26 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-05-27 00:43:26 -0500 |
commit | 232bc96376842da70425cb166363856e8823ce48 (patch) | |
tree | 4155ec27ebad77405207db950d5c8fcaec978bd9 /pkgs/development/libraries/sqlite/default.nix | |
parent | 2760b2446242e7873962e5e6548bee95dfe35aff (diff) | |
download | nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar.gz nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar.bz2 nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar.lz nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar.xz nixpkgs-232bc96376842da70425cb166363856e8823ce48.tar.zst nixpkgs-232bc96376842da70425cb166363856e8823ce48.zip |
Revert "sqlite{,-analyzer}: use the same src (#40945)"
This reverts commit e28a586f94e77f22d943288ad84f88be23c587f8.
Diffstat (limited to 'pkgs/development/libraries/sqlite/default.nix')
-rw-r--r-- | pkgs/development/libraries/sqlite/default.nix | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index 34147432648..eaeafa74129 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,40 +1,29 @@ -{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }: +{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }: assert interactive -> readline != null && ncurses != null; with stdenv.lib; let - archiveVersion = version: - let - segments = splitString "." version; - major = head segments; - minor = concatMapStrings (fixedWidthNumber 2) (tail segments); - in - major + minor + "00"; + archiveVersion = import ./archive-version.nix stdenv.lib; in stdenv.mkDerivation rec { name = "sqlite-${version}"; version = "3.23.1"; - src = fetchzip { - url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0"; + # NB! Make sure to update analyzer.nix src (in the same directory). + src = fetchurl { + url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz"; + sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j"; }; outputs = [ "bin" "dev" "out" ]; separateDebugInfo = stdenv.isLinux; - nativeBuildInputs = [ tcl ]; - buildInputs = [ zlib ] - ++ optionals interactive [ readline ncurses ]; + buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ]; - configureFlags = [ - # Disables libtclsqlite.so, tcl is still required for the build itself: - "--disable-tcl" - "--enable-threadsafe" - ] ++ optional interactive "--enable-readline"; + configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline"; NIX_CFLAGS_COMPILE = [ "-DSQLITE_ENABLE_COLUMN_METADATA" @@ -72,9 +61,9 @@ stdenv.mkDerivation rec { # Necessary for FTS5 on Linux export NIX_LDFLAGS="$NIX_LDFLAGS -lm" - echo + echo "" echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE" - echo + echo "" ''; meta = { |