Skip to content

Commit

Permalink
fix android
Browse files Browse the repository at this point in the history
  • Loading branch information
angerman committed Jan 10, 2022
1 parent 28319ff commit 3aac0ee
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
13 changes: 13 additions & 0 deletions arm-test/cardano-node-patches/iohk-monitoring-framework-625.diff
@@ -0,0 +1,13 @@
diff --git a/iohk-monitoring.cabal b/iohk-monitoring.cabal
index cbf1dc7e..beb4f593 100644
--- a/iohk-monitoring.cabal
+++ b/iohk-monitoring.cabal
@@ -77,7 +77,7 @@ library
exposed-modules: Cardano.BM.Observer.Monadic
Cardano.BM.Observer.STM

- if os(linux)
+ if os(linux) || os(android)
exposed-modules: Cardano.BM.Counters.Linux
if os(windows)
exposed-modules: Cardano.BM.Counters.Windows
5 changes: 5 additions & 0 deletions arm-test/default.nix
Expand Up @@ -163,6 +163,11 @@ nativePkgs.lib.mapAttrs (_: pkgs: rec {
packages.terminal-size.components.library.build-tools = nativePkgs.lib.mkForce [];
packages.network.components.library.build-tools = nativePkgs.lib.mkForce [];
}
({ pkgs, lib, ... }: lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid) {
packages.iohk-monitoring.patches = [ ./cardano-node-patches/iohk-monitoring-framework-625.diff ];
# android default inlining threshold seems to be too high for closure_sizeW to be inlined properly.
packages.cardano-prelude.ghcOptions = [ "-optc=-mllvm" "-optc-inlinehint-threshold=500" ];
})
({ pkgs, lib, ... }: lib.mkIf (!pkgs.stdenv.hostPlatform.isGhcjs) {
packages = {
# See https://github.com/input-output-hk/iohk-nix/pull/488
Expand Down

0 comments on commit 3aac0ee

Please sign in to comment.