cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #142948 from SuperSandro2000/sqlcipher

Browse source
This commit is contained in:
Sandro 2021-10-27 10:25:49 +02:00 committed by GitHub
commit 27a778c5ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/development/libraries/sqlcipher/default.nix
View file

@ -1,6 +1,4 @@
{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline ? null, ncurses ? null }: { stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline, ncurses, zlib }:
assert readline != null -> ncurses != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sqlcipher"; pname = "sqlcipher";
@ -14,16 +12,24 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ installShellFiles tcl ]; nativeBuildInputs = [ installShellFiles tcl ];
buildInputs = [ readline ncurses openssl ]; buildInputs = [ readline ncurses openssl zlib ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; configureFlags = [
"--enable-threadsafe"
"--with-readline-inc=-I${lib.getDev readline}/include"
];
CFLAGS = [
"-DSQLITE_ENABLE_COLUMN_METADATA=1"
"-DSQLITE_SECURE_DELETE=1"
"-DSQLITE_ENABLE_UNLOCK_NOTIFY=1"
"-DSQLITE_HAS_CODEC"
];
CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ];
LDFLAGS = lib.optional (readline != null) "-lncurses";
BUILD_CC = "$(CC_FOR_BUILD)"; BUILD_CC = "$(CC_FOR_BUILD)";
doCheck = false; # fails. requires tcl? TCLLIBDIR = "${placeholder "out"}/lib/tcl${lib.versions.majorMinor tcl.version}";
postInstall = '' postInstall = ''
installManPage sqlcipher.1 installManPage sqlcipher.1

5
pkgs/top-level/all-packages.nix
View file

@ -19566,10 +19566,7 @@ with pkgs;
dqlite = callPackage ../development/libraries/dqlite { }; dqlite = callPackage ../development/libraries/dqlite { };
sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { sqlcipher = callPackage ../development/libraries/sqlcipher { };
readline = null;
ncurses = null;
});
standardnotes = callPackage ../applications/editors/standardnotes { }; standardnotes = callPackage ../applications/editors/standardnotes { };