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/applications/virtualization | |
parent | 77403c1c19f9e9c5f8ba9bb24f83c07eace126b2 (diff) | |
download | nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.gz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.bz2 nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.lz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.xz nixlib-8929989614589ee3acd070a6409b2b9700c92d65.tar.zst nixlib-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/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/crosvm/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/virtualization/vpcs/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 3ad540e53072..848b93a5381c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -75,7 +75,7 @@ in CROSVM_CARGO_TEST_KERNEL_BINARY = lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) - "${linux}/${stdenv.hostPlatform.platform.kernelTarget}"; + "${linux}/${stdenv.hostPlatform.linux-kernel.target}"; passthru = { inherit adhdSrc; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 33d707a50079..8c41a1f4c274 100644 --- a/pkgs/applications/virtualization/vpcs/default.nix +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = ''( cd src - ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} + ./mk.sh ${stdenv.buildPlatform.linuxArch} )''; installPhase = '' |