diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-29 00:01:14 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-21 22:44:09 -0500 |
| commit | 8929989614589ee3acd070a6409b2b9700c92d65 (patch) | |
| tree | 595f163bed2eda4b564fa19df7ed03e7679af00b /pkgs/build-support/vm/default.nix | |
| parent | 77403c1c19f9e9c5f8ba9bb24f83c07eace126b2 (diff) | |
| download | nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar.gz nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar.bz2 nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar.lz nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar.xz nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.tar.zst nixpkgs-8929989614589ee3acd070a6409b2b9700c92d65.zip | |
lib: Clean up how linux and gcc config is specified
The `platform` field is pointless nesting: it's just stuff that happens to be defined together, and that should be an implementation detail. This instead makes `linux-kernel` and `gcc` top level fields in platform configs. They join `rustc` there [all are optional], which was put there and not in `platform` in anticipation of a change like this. `linux-kernel.arch` in particular also becomes `linuxArch`, to match the other `*Arch`es. The next step after is this to combine the *specific* machines from `lib.systems.platforms` with `lib.systems.examples`, keeping just the "multiplatform" ones for defaulting.
Diffstat (limited to 'pkgs/build-support/vm/default.nix')
| -rw-r--r-- | pkgs/build-support/vm/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 5f3c7e1d621..215782368f6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,6 +1,6 @@ { pkgs , kernel ? pkgs.linux -, img ? pkgs.stdenv.hostPlatform.platform.kernelTarget +, img ? pkgs.stdenv.hostPlatform.linux-kernel.target , storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "crc32c_generic" ] |