diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-08 17:57:14 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-13 11:31:47 +0000 |
| commit | ee7984efa14902a2ddd820c937457667a4f40c6a (patch) | |
| tree | c9c1d046733cefe5e21fdd8a52104175d47b2443 /nixpkgs/pkgs/development/libraries/sqlcipher | |
| parent | ffc9d4ba381da62fd08b361bacd1e71e2a3d934d (diff) | |
| parent | b3c692172e5b5241b028a98e1977f9fb12eeaf42 (diff) | |
| download | nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.gz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.bz2 nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.lz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.xz nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.tar.zst nixlib-ee7984efa14902a2ddd820c937457667a4f40c6a.zip | |
Merge commit 'b3c692172e5b5241b028a98e1977f9fb12eeaf42'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/sqlcipher')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/sqlcipher/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix index 44da759409ee..1874e3d82552 100644 --- a/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, readline ? null, ncurses ? null }: +{ stdenv, lib, fetchFromGitHub, openssl, tcl, installShellFiles, buildPackages, readline ? null, ncurses ? null }: assert readline != null -> ncurses != null; @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw="; }; - nativeBuildInputs = [ installShellFiles ]; - - buildInputs = [ readline ncurses openssl tcl ]; + nativeBuildInputs = [ installShellFiles tcl ]; + buildInputs = [ readline ncurses openssl ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; configureFlags = [ "--enable-threadsafe" "--disable-tcl" ]; 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)"; doCheck = false; # fails. requires tcl? |