dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #41211 from orivej/sqlite

Browse Source 
sqlite: do not contaminate dependent libtool-based projects with sqlite dependencies
This commit is contained in:
Orivej Desh 2018-05-29 15:31:25 +00:00 committed by GitHub
commit 5197a4cefd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/sqlite/default.nix
View File

@ -66,6 +66,11 @@ stdenv.mkDerivation rec {
echo "" 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 = { meta = {
description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
downloadPage = http://sqlite.org/download.html; downloadPage = http://sqlite.org/download.html;

4
pkgs/development/libraries/vsqlite/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, sqlite, zlib }: { stdenv, fetchurl, boost, sqlite }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "vsqlite-${version}"; name = "vsqlite-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
}; };
buildInputs = [ boost sqlite zlib ]; buildInputs = [ boost sqlite ];
prePatch = stdenv.lib.optionalString stdenv.isDarwin '' prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace Makefile.in \ substituteInPlace Makefile.in \