mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-19 02:44:17 +03:00
fossil: 2.16 -> 2.17
Add option to prefer internal/bundled sqlite3 which is what fossil seems to prefer
This commit is contained in:
parent
9aeeb7574f
commit
a28064c96c
@ -6,6 +6,7 @@
|
|||||||
, zlib
|
, zlib
|
||||||
, openssl
|
, openssl
|
||||||
, readline
|
, readline
|
||||||
|
, withInternalSqlite ? true
|
||||||
, sqlite
|
, sqlite
|
||||||
, ed
|
, ed
|
||||||
, which
|
, which
|
||||||
@ -15,23 +16,25 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "fossil";
|
pname = "fossil";
|
||||||
version = "2.16";
|
version = "2.17";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
|
url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz";
|
||||||
sha256 = "1z5ji25f2rqaxd1nj4fj84afl1v0m3mnbskgfwsjr3fr0h5p9aqy";
|
sha256 = "0539rsfvwv49qyrf36z5m0k74kvnn6y5xasm9vvi6lbphx8yxmi1";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles tcl tcllib ];
|
nativeBuildInputs = [ installShellFiles tcl tcllib ];
|
||||||
|
|
||||||
buildInputs = [ zlib openssl readline sqlite which ed ]
|
buildInputs = [ zlib openssl readline which ed ]
|
||||||
++ lib.optional stdenv.isDarwin libiconv;
|
++ lib.optional stdenv.isDarwin libiconv
|
||||||
|
++ lib.optional (!withInternalSqlite) sqlite;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||||
|
|
||||||
configureFlags = [ "--disable-internal-sqlite" ]
|
configureFlags =
|
||||||
|
lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
|
||||||
++ lib.optional withJson "--json";
|
++ lib.optional withJson "--json";
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
|
Loading…
Reference in New Issue
Block a user