diff options
| author | Ben Siraphob <bensiraphob@gmail.com> | 2021-08-04 13:04:07 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 13:04:07 +0700 |
| commit | 5e1e2914eb8d6548ff5bd710afb89a6043bba620 (patch) | |
| tree | 2cc1769fd7d8522e7cc770da0c9c649427d6430f | |
| parent | 7b8141a42c35b08f6392ba72e4c395679e47574c (diff) | |
| parent | 3e3e445d8df77d39c22370ad89106e2db104f7e2 (diff) | |
| download | nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar.gz nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar.bz2 nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar.lz nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar.xz nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.tar.zst nixpkgs-5e1e2914eb8d6548ff5bd710afb89a6043bba620.zip | |
Merge pull request #132573 from yu-re-ka/feature/sqlcipher-static
sqlcipher: fix cross build
| -rw-r--r-- | pkgs/development/libraries/sqlcipher/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 44da759409e..1874e3d8255 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/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? |