use commoncrypto flag in ios nix build (for sqlcipher) (#1006)

* use commoncrypto flag in ios nix build (for sqlcipher)

* remove openssl flag from cabal.project
This commit is contained in:
Evgeny Poberezkin 2022-09-02 11:26:14 +01:00 committed by GitHub
parent 6597400f61
commit 38b3965e68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions

View file

@ -4,9 +4,6 @@ packages: .
constraints: zip +disable-bzip2 +disable-zstd
package direct-sqlcipher
flags: +openssl
source-repository-package
type: git
location: https://github.com/simplex-chat/simplexmq.git

View file

@ -219,7 +219,13 @@
};
"aarch64-darwin" = {
# this is the aarch64-darwin iOS build (to be patched with mac2ios)
"aarch64-darwin-ios:lib:simplex-chat" = (drv' { pkgs' = pkgs; extra-modules = [{ packages.simplexmq.flags.swift = true; }]; } ).simplex-chat.components.library.override {
"aarch64-darwin-ios:lib:simplex-chat" = (drv' {
pkgs' = pkgs;
extra-modules = [{
packages.simplexmq.flags.swift = true;
packages.direct-sqlcipher.flags.commoncrypto = true;
}];
} ).simplex-chat.components.library.override {
smallAddressSpace = true; enableShared = false;
# we need threaded here, otherwise all the queing logic doesn't work properly.
# for iOS we also use -staticlib, to get one rolled up library.
@ -273,7 +279,13 @@
};
"x86_64-darwin" = {
# this is the aarch64-darwin iOS build (to be patched with mac2ios)
"x86_64-darwin-ios:lib:simplex-chat" = (drv' { pkgs' = pkgs; extra-modules = [{ packages.simplexmq.flags.swift = true; }]; } ).simplex-chat.components.library.override {
"x86_64-darwin-ios:lib:simplex-chat" = (drv' {
pkgs' = pkgs;
extra-modules = [{
packages.simplexmq.flags.swift = true;
packages.direct-sqlcipher.flags.commoncrypto = true;
}];
} ).simplex-chat.components.library.override {
smallAddressSpace = true; enableShared = false;
# we need threaded here, otherwise all the queing logic doesn't work properly.
# for iOS we also use -staticlib, to get one rolled up library.