Skip to content

Commit b51d99e

Browse files
committed
some optimization flags, disable geckoview
1 parent c100066 commit b51d99e

File tree

3 files changed

+13
-1
lines changed

3 files changed

+13
-1
lines changed

ghcjs/currency-converter/android.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
with (import ./default.nix); let
22
pkgs = android-pkgs;
33
repo = toString ./.;
4+
geckoview = false;
45
android-sdk =
56
(pkgs.androidenv.composeAndroidPackages android-sdk-args).androidsdk;
67
app-keygen-android = pkgs.writeShellApplication {
@@ -51,7 +52,11 @@ with (import ./default.nix); let
5152
--android --assetPath static
5253
${pkgs.nodejs}/bin/npx trapeze run trapeze.yaml -y \
5354
--android-project android
54-
printf "include ':capacitor-android'\nproject(':capacitor-android').projectDir = new File('../capacitor-geckoview/capacitor')" > ./android/capacitor.settings.gradle
55+
${
56+
if geckoview
57+
then ''printf "include ':capacitor-android'\nproject(':capacitor-android').projectDir = new File('../capacitor-geckoview/capacitor')" > ./android/capacitor.settings.gradle''
58+
else ""
59+
}
5560
)
5661
'';
5762
};

ghcjs/currency-converter/app.cabal

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ executable app
9696

9797
if impl(ghcjs)
9898
ghc-options: -Wno-missing-home-modules
99+
cpp-options: -DGHCJS_BROWSER
100+
101+
if !flag(ghcid)
102+
ghc-options:
103+
-O2 -optc-O3 -funfolding-use-threshold=16 -threaded -rtsopts
104+
-with-rtsopts=-N
99105

100106
if (flag(ghcid) && impl(ghc >=8.10.7))
101107
ghc-options: -Wno-unused-packages

ghcjs/currency-converter/shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ in
2929
app-release-aab
3030
app-release-license
3131
functora-pkgs.cabal-install
32+
functora-pkgs.closurecompiler
3233
]
3334
++ prev.buildInputs
3435
++ functora-tools;

0 commit comments

Comments
 (0)