From 72a4c545f098e96647ed5e9ebba771d7e27e10e9 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 31 Oct 2022 19:17:33 -0400 Subject: [PATCH] tup: avoid vendoring sqlite3 --- pkgs/development/tools/build-managers/tup/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 3d0b68b12d84..e53acd4e9e60 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, pcre }: +{ lib, stdenv, fetchFromGitHub, fuse3, macfuse-stubs, pkg-config, sqlite, pcre }: let fuse = if stdenv.isDarwin then macfuse-stubs else fuse3; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse pcre sqlite ]; patches = [ ./fusermount-setuid.patch ]; @@ -31,6 +31,7 @@ in stdenv.mkDerivation rec { cat << EOF > tup.config CONFIG_CC=${stdenv.cc.targetPrefix}cc CONFIG_AR=${stdenv.cc.targetPrefix}ar + CONFIG_TUP_USE_SYSTEM_SQLITE=y EOF '';