Allow running without container with nix#345
Conversation
|
Cool! it's definitely a start. |
1b5f6ca to
4e30e32
Compare
f3490d2 to
325f2a4
Compare
|
@avandecreme I appreciate the work you are doing here. But you keep force pushing a single commit with ~1500 lines changed, I'm not sure how to review that and understand all the changes, I can't follow your reasoning if it's a single commit. |
| inputs = { | ||
| nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; | ||
|
|
||
| runfromprocess-rs.url = "github:quietvoid/runfromprocess-rs?rev=a3d003c07d1bd11ff93c4cac96d2c3aa5deb8471"; |
There was a problem hiding this comment.
This is not ideal because it pulls an old rust compiler. Maybe we should just embed a built binary in this repo?
There was a problem hiding this comment.
Why would it pull an old compiler? There's nothing in the flake indicating a specific version.
There could be a release with a pre-built binary which can be downloaded, instead.
There was a problem hiding this comment.
Why would it pull an old compiler?
Because it picks the one in the lockfile.
Apparently, I could write this to avoid that though:
runfromprocess-rs = {
url = "github:quietvoid/runfromprocess-rs?rev=a3d003c07d1bd11ff93c4cac96d2c3aa5deb8471";
inputs.nixpkgs.follows = "nixpkgs";
inputs.fenix.follows = "fenix";
};Using a pre-built binary would be better in my opinion. This would avoid having to pull any rust compiler.
Would you accept a PR on https://github.com/quietvoid/runfromprocess-rs to make it publish a binary on release?
c7658ca to
440ba48
Compare
Move the container package wrapper, common derivation helpers, and NixOS module out of flake.nix into separate files under nix/. flake.nix becomes a thin orchestrator. No behavioral change.
Add support for running Zwift natively using Wine in a FHS environment as an alternative to containers. Introduces src/zwift-nix-fhs.sh as the FHS launch script, extends run_zwift.sh and update_zwift.sh to handle the nix-fhs container tool, adds nix/zwift-fhs-package.nix, wires up the new runfromprocess-rs input, and extends the NixOS module with containerTool = "fhs".
Parametrize the NixOS test flake to build all three containerTool values (podman, docker, fhs) and update CI to check all three.
Update the NixOS documentation with containerTool = "fhs" and winePrefix.
I split in four commits. Hopefully, this is more approachable. I also cleaned up stuff from claude. |
4 participants
This is variant number 3 in #28
This is very much not ready for merge but since I was able to make my first ride with it, I figured I would share it already.
Things to fix before merging: