android-apps-mirrors/SimpleX-Chat
0
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2025-06-29 04:39:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sqlcipher

Browse source
This commit is contained in:
Evgeny Poberezkin 2022-09-11 13:49:44 +01:00
commit 42088fc78d
1 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

63
flake.nix
View file

@ -68,6 +68,15 @@
echo "file binary-dist \"$(echo $out/*.zip)\"" \ echo "file binary-dist \"$(echo $out/*.zip)\"" \
> $out/nix-support/hydra-build-products > $out/nix-support/hydra-build-products
''; in ''; in
let iosOverrides = bundleName: {
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.
# still needs mac2ios patching of the archives.
ghcOptions = [ "-staticlib" "-threaded" "-DIOS" ];
postInstall = iosPostInstall bundleName;
}; in
rec { rec {
packages = { packages = {
"lib:simplex-chat" = (drv pkgs).simplex-chat.components.library; "lib:simplex-chat" = (drv pkgs).simplex-chat.components.library;
@ -272,67 +281,49 @@
''; '';
}; };
}; };
# builds for iOS and iOS simulator
"aarch64-darwin" = { "aarch64-darwin" = {
# this is the aarch64-darwin iOS build (to be patched with mac2ios) # aarch64-darwin iOS build (to be patched with mac2ios)
"aarch64-darwin-ios:lib:simplex-chat" = (drv' { "aarch64-darwin-ios:lib:simplex-chat" = (drv' {
pkgs' = pkgs; pkgs' = pkgs;
extra-modules = [{ extra-modules = [{
packages.simplexmq.flags.swift = true; packages.simplexmq.flags.swift = true;
packages.direct-sqlcipher.flags.commoncrypto = true; packages.direct-sqlcipher.flags.commoncrypto = true;
}]; }];
}).simplex-chat.components.library.override { }).simplex-chat.components.library.override (
smallAddressSpace = true; enableShared = false; iosOverrides "pkg-ios-aarch64-swift-json"
# 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. # aarch64-darwin build with tagged JSON format (for Mac & Flutter)
# still needs mac2ios patching of the archives.
ghcOptions = [ "-staticlib" "-threaded" "-DIOS" ];
postInstall = iosPostInstall "pkg-ios-aarch64-swift-json";
};
# This is the aarch64-darwin build with tagged JSON format (for Mac & Flutter)
"aarch64-darwin:lib:simplex-chat" = (drv' { "aarch64-darwin:lib:simplex-chat" = (drv' {
pkgs' = pkgs; pkgs' = pkgs;
extra-modules = [{ extra-modules = [{
packages.direct-sqlcipher.flags.commoncrypto = true; packages.direct-sqlcipher.flags.commoncrypto = true;
}]; }];
}).simplex-chat.components.library.override { }).simplex-chat.components.library.override (
smallAddressSpace = true; enableShared = false; iosOverrides "pkg-ios-aarch64-tagged-json"
# 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.
# still needs mac2ios patching of the archives.
ghcOptions = [ "-staticlib" "-threaded" "-DIOS" ];
postInstall = iosPostInstall "pkg-ios-aarch64-tagged-json";
};
}; };
"x86_64-darwin" = { "x86_64-darwin" = {
# this is the aarch64-darwin iOS build (to be patched with mac2ios) # x86_64-darwin iOS simulator build (to be patched with mac2ios)
"x86_64-darwin-ios:lib:simplex-chat" = (drv' { "x86_64-darwin-ios:lib:simplex-chat" = (drv' {
pkgs' = pkgs; pkgs' = pkgs;
extra-modules = [{ extra-modules = [{
packages.simplexmq.flags.swift = true; packages.simplexmq.flags.swift = true;
packages.direct-sqlcipher.flags.commoncrypto = true; packages.direct-sqlcipher.flags.commoncrypto = true;
}]; }];
}).simplex-chat.components.library.override { }).simplex-chat.components.library.override (
smallAddressSpace = true; enableShared = false; iosOverrides "pkg-ios-x86_64-swift-json"
# 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. # x86_64-darwin build with tagged JSON format (for Mac & Flutter iOS simulator)
# still needs mac2ios patching of the archives.
ghcOptions = [ "-staticlib" "-threaded" "-DIOS" ];
postInstall = iosPostInstall "pkg-ios-x86_64-swift-json";
};
# This is the aarch64-darwin build with tagged JSON format (for Mac & Flutter)
"x86_64-darwin:lib:simplex-chat" = (drv' { "x86_64-darwin:lib:simplex-chat" = (drv' {
pkgs' = pkgs; pkgs' = pkgs;
extra-modules = [{ extra-modules = [{
packages.direct-sqlcipher.flags.commoncrypto = true; packages.direct-sqlcipher.flags.commoncrypto = true;
}]; }];
}).simplex-chat.components.library.override { }).simplex-chat.components.library.override (
smallAddressSpace = true; enableShared = false; iosOverrides "pkg-ios-x86_64-tagged-json"
# 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.
# still needs mac2ios patching of the archives.
ghcOptions = [ "-staticlib" "-threaded" "-DIOS" ];
postInstall = iosPostInstall "pkg-ios-x86_64-tagged-json";
};
}; };
}.${system} or {}); }.${system} or {});
# build all packages in hydra. # build all packages in hydra.