From c83a53098599c49ec57823bf655ce8b45f6aea10 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 14:20:43 +0000 Subject: [PATCH 1/2] sqlite: do not contaminate dependent libtool-based projects with sqlite dependencies sqlite is built as a shared library, but libtool nevertheless adds -lz into the link commands of the dependent projects, which fail to link if they do not directly depend on libz. Fix this by clearing dependency_libs in libsqlite3.la. --- pkgs/development/libraries/sqlite/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index eaeafa741297..03f2f5c7199e 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -66,6 +66,11 @@ stdenv.mkDerivation rec { echo "" ''; + postInstall = '' + # Do not contaminate dependent libtool-based projects with sqlite dependencies. + sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/" + ''; + meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; downloadPage = http://sqlite.org/download.html; From 2100519278a662714e0aa4ff406dc2bb9062dc7a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 15:00:45 +0000 Subject: [PATCH 2/2] Revert "vsqlite: fix build" This reverts commit e89414ff699ddd0689a696db7889b6e5654c847d. --- pkgs/development/libraries/vsqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index d9a9564e6de1..bfb07c2df337 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, sqlite, zlib }: +{ stdenv, fetchurl, boost, sqlite }: stdenv.mkDerivation rec { name = "vsqlite-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; }; - buildInputs = [ boost sqlite zlib ]; + buildInputs = [ boost sqlite ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.in \