IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

964 everywhere.

Browse Source
This commit is contained in:
Moritz Angermann 2024-01-22 02:06:12 +00:00
parent 68de2b7540
commit dbdbbbdbb3
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.nix
View File

@ -29,8 +29,8 @@
}; in }; in
# `appendOverlays` with a singleton is identical to `extend`. # `appendOverlays` with a singleton is identical to `extend`.
let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in let pkgs = haskellNix.legacyPackages.${system}.appendOverlays [android26]; in
let drv' = { extra-modules, pkgs', ... }: pkgs'.haskell-nix.project { let drv' = { extra-modules, pkgs', compiler-nix-name, ... }: pkgs'.haskell-nix.project {
compiler-nix-name = "ghc963"; inherit compiler-nix-name;
index-state = "2023-12-12T00:00:00Z"; index-state = "2023-12-12T00:00:00Z";
# We need this, to specify we want the cabal project. # We need this, to specify we want the cabal project.
# If the stack.yaml was dropped, this would not be necessary. # If the stack.yaml was dropped, this would not be necessary.
@ -51,7 +51,7 @@
})] ++ extra-modules; })] ++ extra-modules;
}; in }; in
# by defualt we don't need to pass extra-modules. # by defualt we don't need to pass extra-modules.
let drv = pkgs': drv' { extra-modules = []; inherit pkgs'; }; in let drv = pkgs': drv' { extra-modules = []; inherit pkgs'; compiler-nix-name = "ghc964"; }; in
# This will package up all *.a in $out into a pkg.zip that can # This will package up all *.a in $out into a pkg.zip that can
# be downloaded from hydra. # be downloaded from hydra.
let withHydraLibPkg = pkg: pkg.overrideAttrs (old: { let withHydraLibPkg = pkg: pkg.overrideAttrs (old: {
@ -262,7 +262,7 @@
# STATIC aarch64-linux # STATIC aarch64-linux
"${pkgs.pkgsCross.aarch64-multiplatform-musl.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.aarch64-multiplatform-musl).simplex-chat.components.exes.simplex-chat; "${pkgs.pkgsCross.aarch64-multiplatform-musl.hostPlatform.system}-static:exe:simplex-chat" = (drv pkgs.pkgsCross.aarch64-multiplatform-musl).simplex-chat.components.exes.simplex-chat;
"armv7a-android:lib:support" = (drv android32Pkgs).android-support.components.library.override (p: { "armv7a-android:lib:support" = (drv' { extra-modules = []; pkgs' = android32Pkgs; compiler-nix-name = "ghc8107"; } ).android-support.components.library.override (p: {
smallAddressSpace = true; smallAddressSpace = true;
# we won't want -dyamic (see aarch64-android:lib:simplex-chat) # we won't want -dyamic (see aarch64-android:lib:simplex-chat)
enableShared = false; enableShared = false;
@ -325,6 +325,7 @@
''; '';
}); });
"armv7a-android:lib:simplex-chat" = (drv' { "armv7a-android:lib:simplex-chat" = (drv' {
compiler-nix-name = "ghc8107";
pkgs' = android32Pkgs; pkgs' = android32Pkgs;
extra-modules = [{ extra-modules = [{
packages.text.flags.simdutf = false; packages.text.flags.simdutf = false;
@ -340,7 +341,7 @@
]; ];
# 32 bit patches # 32 bit patches
packages.basement.patches = [ packages.basement.patches = [
./scripts/nix/basement-pr-573.patch # ./scripts/nix/basement-pr-573.patch
]; ];
packages.memory.patches = [ packages.memory.patches = [
./scripts/nix/memory-pr-99.patch ./scripts/nix/memory-pr-99.patch
@ -432,6 +433,7 @@
''; '';
}); });
"aarch64-android:lib:simplex-chat" = (drv' { "aarch64-android:lib:simplex-chat" = (drv' {
compiler-nix-name = "ghc964";
pkgs' = androidPkgs; pkgs' = androidPkgs;
extra-modules = [{ extra-modules = [{
packages.text.flags.simdutf = false; packages.text.flags.simdutf = false;