Fix mobile builds #1108
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,23 +15,72 @@ | |
| } | ||
| }: | ||
| with obelisk; | ||
| let args = { | ||
| # You must accept the Android Software Development Kit License Agreement at | ||
| # https://developer.android.com/studio/terms in order to build Android apps. | ||
| # Uncomment this to indicate your acceptance: | ||
| android_sdk_accept_license = true; | ||
| allowUnfree = true; | ||
| }; in | ||
|
|
||
| project args ({ pkgs, ... }: { | ||
| name = "skeleton"; | ||
| android = { | ||
| executable = ps: exes: (exes (ps.frontend)).frontend; | ||
| executableName = "obelisk-skeleton"; | ||
| applicationId = "systems.obsidian.obelisk.examples.minimal"; | ||
| displayName = "Obelisk Minimal Example"; | ||
| }; | ||
| ios = { | ||
| executable = ps: exes: (exes (ps.frontend)).frontend; | ||
| executableName = "obelisk-skeleton"; | ||
| bundleIdentifier = "systems.obsidian.obelisk.examples.minimal"; | ||
| bundleName = "Obelisk Minimal Example"; | ||
| }; | ||
| web = { | ||
| executable = ps: exes: (exes (ps.frontend)).frontend; | ||
| }; | ||
| extraArgs = { | ||
| staticFiles = ./static; | ||
| }; | ||
| src = ./.; | ||
| inputThunks = pkgs.obsidianCompilers.thunkSets.common ++ [ | ||
| pkgs._dep.source.aeson-1541 | ||
| pkgs._dep.source.android-activity | ||
cidkidnix marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ]; | ||
| shells = ps: with ps; [ | ||
| backend | ||
| ]; | ||
| overrides = [ | ||
| ({ config, pkgs, lib, ... }: { | ||
| config.enableShared = if pkgs.stdenv.targetPlatform.isiOS then lib.mkForce false else true; | ||
| config.enableStatic = lib.mkForce true; | ||
| }) | ||
| ({pkgs, lib, config, ... }: { | ||
| packages.obelisk-run.components.library.build-tools = with pkgs; [ | ||
| iproute | ||
| ]; | ||
|
|
||
| packages.reflex-dom = { | ||
| flags = { | ||
| webkit2gtk = if (pkgs.stdenv.targetPlatform.isAndroid) then lib.mkForce false else true; | ||
| }; | ||
| }; | ||
|
|
||
| packages.frontend.components.exes.frontend = { | ||
| frameworks = if (!pkgs.stdenv.targetPlatform.isiOS && pkgs.stdenv.targetPlatform.isDarwin) then [ pkgs.darwin.apple_sdk.frameworks.CoreFoundation ] else [ ]; | ||
| postInstall = lib.optionalString (pkgs.stdenv.hostPlatform.isDarwin) '' | ||
| mkdir -p $out/obelisk-skeleton.app | ||
| cp -r obelisk-skeleton $out | ||
| cp $out/bin/obelisk-skeleton $out/obelisk-skeleton.app | ||
| ''; | ||
| }; | ||
| packages.jsaddle-wkwebview.src = (thunkSource ../dep/jsaddle) + "/jsaddle-wkwebview"; | ||
| packages.jsaddle-wkwebview.components.library = { | ||
| frameworks = | ||
| if (pkgs.stdenv.targetPlatform.isiOS) then lib.mkForce [ pkgs.darwin.iosSdkPkgs.sdk pkgs.darwin.apple_sdk.frameworks.CoreFoundation ] | ||
| else [ pkgs.darwin.apple_sdk.frameworks.CoreFoundation ]; | ||
| }; | ||
|
There was a problem hiding this comment. Was getting webkit2gtk eval failures on android so cargo-culted this section from https://github.com/reflex-frp/reflex-platform/blob/4fccfb196ac724695a5006a456b2125eeff331e5/example/default.nix#L62 We definitely don't want this re-done on every project. There was a problem hiding this comment. I think the linked code should always be applied in obelisk (not so much in reflex-platform). If folks need to overwrite it they can use "lib.mkOverride" for a higher value than "lib.mkForce". I'd much rather this be a default instead of some documentation or comments anywhere There was a problem hiding this comment. Well yes but a default on obelisk or on the obelisk skeleton? |
||
| }) | ||
| ]; | ||
| }) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be set to false before merging.
How do we make sure CI caches it though?
Add the accept/allow as args to this file defaulting to false and overriden by CI?