Kiosk development environment for macOS #167
Open
Conversation
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
Executing another bash inside the shell hook seems to break running commands with `nix-shell --run`, something we assumed to work in the CI configuration. It seems that the Qt wrapper is already set up at least in modern Nixpkgs, so we can simply remove the code for spawning the wrapped bash.
We previously added support for using the kiosk without connman installed, but it still crashed when started on systems without DBus (i.e. any non-Linux platform). With this change we add a stub implementation of the core proxy abstraction, which is going to provide safe no-op responses on non-Linux platforms, allowing to use the kiosk, albeit without proxy support.
To avoid pulling in dbus stuff on MacOS altogether.
This sets up a development environment for the kiosk on macOS, as the default nix-shell is currently broken due to upstream issues with the `pyqt6-webengine` package. The environment is managed using virtualenv and the `poetry` package manager instead.
krksgbr
added
reviewable
knuton
reviewed
Jun 10, 2024
knuton
requested changes
Jun 10, 2024
kiosk/kiosk_browser/main_widget.py
Outdated
Comment on lines
18
to
25
| if platform.system() in ['Darwin']: | ||
| from kiosk_browser.proxy import Proxy | ||
| import os | ||
| system = System(name = "PlayOS", | ||
| version = os.getenv("PLAYOS_VERSION","1.0.0-dev")) | ||
| else: | ||
| from kiosk_browser.dbus_proxy import DBusProxy as Proxy | ||
| system = System() |
There was a problem hiding this comment.
What if we moved this branching to the system module/System class?
It could offer something like a def infer() -> System function.
There was a problem hiding this comment.
Something like this?
knuton
added
changes suggested
krksgbr
added
reviewable
|
Yay! Works on my machine! |
stoeffel
approved these changes
Jun 11, 2024
knuton
added
details needed
|
I seem to have found a problem on Linux, which is due to the Qt6 migration, not this PR. I am going to open a PR against the release branch. Otherwise this also looks good to me. Looks like a one line fix, which we can then apply here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Follow up on #159 to make the kiosk run without DBus.
The pyqt webengine bindings in nixpkgs are currently broken on darwin, so I created a separate development shell for macOS which makes use of virtualenv and poetry to manage dependencies.
I'm requesting two reviews to test on both nixOS and macOS.
To run the kiosk on macOS:
Checklist
[ ] Changelog updated