File tree Expand file tree Collapse file tree 3 files changed +13
-1
lines changed Expand file tree Collapse file tree 3 files changed +13
-1
lines changed Original file line number Diff line number Diff line change 1
1
with ( import ./default.nix ) ; let
2
2
pkgs = android-pkgs ;
3
3
repo = toString ./. ;
4
+ geckoview = false ;
4
5
android-sdk =
5
6
( pkgs . androidenv . composeAndroidPackages android-sdk-args ) . androidsdk ;
6
7
app-keygen-android = pkgs . writeShellApplication {
@@ -51,7 +52,11 @@ with (import ./default.nix); let
51
52
--android --assetPath static
52
53
${ pkgs . nodejs } /bin/npx trapeze run trapeze.yaml -y \
53
54
--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
+ }
55
60
)
56
61
'' ;
57
62
} ;
Original file line number Diff line number Diff line change @@ -96,6 +96,12 @@ executable app
96
96
97
97
if impl(ghcjs)
98
98
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
99
105
100
106
if (flag(ghcid) && impl(ghc >= 8.10.7 ))
101
107
ghc-options : -Wno-unused-packages
Original file line number Diff line number Diff line change 29
29
app-release-aab
30
30
app-release-license
31
31
functora-pkgs . cabal-install
32
+ functora-pkgs . closurecompiler
32
33
]
33
34
++ prev . buildInputs
34
35
++ functora-tools ;
You can’t perform that action at this time.
0 commit comments