Merge pull request #34688 from andrew-d/adunham/dbd-sqlite

Fix build failures with DBD-SQLite
This commit is contained in:
Jörg Thalheim 2018-02-10 08:27:49 +00:00 committed by GitHub
commit 2c5c928a10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,11 +2,11 @@
buildPerlPackage rec { buildPerlPackage rec {
name = "DBD-SQLite-${version}"; name = "DBD-SQLite-${version}";
version = "1.54"; version = "1.55_07";
src = fetchurl { src = fetchurl {
url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; url = "https://github.com/DBD-SQLite/DBD-SQLite/archive/${version}.tar.gz";
sha256 = "3929a6dbd8d71630f0cb57f85dcef9588cd7ac4c9fa12db79df77b9d3a4d7269"; sha256 = "0213a31eb7b5afc2d7b3775ca2d1717d07fc7e9ed21ae73b2513a8d54ca222d8";
}; };
propagatedBuildInputs = [ DBI ]; propagatedBuildInputs = [ DBI ];
@ -17,8 +17,7 @@ buildPerlPackage rec {
./external-sqlite.patch ./external-sqlite.patch
]; ];
SQLITE_INC = sqlite.dev + "/include"; makeMakerFlags = "SQLITE_INC=${sqlite.dev}/include SQLITE_LIB=${sqlite.out}/lib";
SQLITE_LIB = sqlite.out + "/lib";
preBuild = preBuild =
'' ''