From 38b3965e689ca8de5ada1b8261b99db0835a6d8c Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Fri, 2 Sep 2022 11:26:14 +0100 Subject: [PATCH] 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 --- cabal.project | 3 --- flake.nix | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index e859fc0749..de7ae67bb1 100644 --- a/cabal.project +++ b/cabal.project @@ -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 diff --git a/flake.nix b/flake.nix index eab982de5d..23f22ee737 100644 --- a/flake.nix +++ b/flake.nix @@ -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.