Separate nix-file for example and vmbuild, fix conflicts #2238
Conversation
vmbuild doesn't require the includeos build environment, but needs the source code. To avoid a circular dependency, this creates a vmbuild.nix in the root directory and includes the parts of the source code that vmbuild needs. `nix-build ./vmbuild.nix` produces vmbuild and elf_syms binaries in result/bin. This commit also removes conan specific details from vmbuild/CMakeLists.txt
Moves the example to a separate nix-file. To link the example binary, run: nix-build ./example.nix
|
After #2236 is merged, we could hopefully also move the current default.nix to includeos.nix and make a toplevel nix-file that builds everything - but I haven't tested this yet. |
There was a problem hiding this comment.
Looks really good! (and builds cleanly with nix-build example.nix / nix-build vmbuild.nix). I like that they are decoupled and that I can do this:
~/IncludeOS$ nix-build
/nix/store/12fvih0pm1g98r7z3vikh74f9h2ww6y1-includeos-static-x86_64-unknown-linux-musl-dev
to get my IncludeOS package and not just the example binary.
I think we'll want the example to also depend on vmbuild but right now it doesn't so we can hook that up when needed. It's a TODO in cmake/os.cmake to hook elf_syms back in - not sure if we want to do it in cmake or nix actually - I think I prefer nix; it reduces dependencies between cmake files and nix is a nicer language.
Maybe it's a postBuild step of the example - maybe optional - to create a vm with vmbuild, or grubify.sh once we recover that script.
Unless @bjornfor has objections or thinks we should do this differently, please merge.
|
Thanks - I'll merge this to unblock #2236 |
Separate nix-file for example and vmbuild, fix conflicts
This adds vmbuild.nix to build the vmbuild-tools and moves the example from default.nix to example.nix.
They can be built separately with:
nix-build ./vmbuild.nix
nix-build ./example.nix
This should also remove the conflicts from #2236