From a3987ff32852e6747c6e8a763a56a4ffd3a9f0e2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 9 Nov 2025 14:49:40 +0100 Subject: [PATCH] sqlite: Build canonical source with tcl See https://github.com/sqlite/sqlite/blob/051e942f5db1cbc3fce64d3a52df7428fe517de4/autoconf/README.txt#L27-L40 for motivation Also adds support for the TCL sqlite library --- pkgs/development/libraries/sqlite/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ff46657680fd..c58f52be9527 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, unzip, + tcl, zlib, readline, ncurses, @@ -32,8 +33,8 @@ stdenv.mkDerivation rec { # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { - url = "https://sqlite.org/2026/sqlite-autoconf-${archiveVersion version}.tar.gz"; - hash = "sha256-+9ifhmsUA7tmoUMGVEAInddhAPIjgxTZInSggtTyt7s="; + url = "https://sqlite.org/2026/sqlite-src-${archiveVersion version}.zip"; + hash = "sha256-hREPdi1QeUFNmd1deRe8P/fgWHbmzL0T2ElqOBfyCCk="; }; docsrc = fetchurl { url = "https://sqlite.org/2026/sqlite-doc-${archiveVersion version}.zip"; @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip + tcl ]; buildInputs = [ zlib @@ -74,10 +76,13 @@ stdenv.mkDerivation rec { # on a per-output basis. setOutputFlags = false; + env.TCLLIBDIR = "${placeholder "out"}/lib"; + configureFlags = [ "--bindir=${placeholder "bin"}/bin" "--includedir=${placeholder "dev"}/include" "--libdir=${placeholder "out"}/lib" + "--with-tcl=${lib.getLib tcl}/lib" ] ++ lib.optional (!interactive) "--disable-readline" # autosetup only looks up readline.h in predefined set of directories.