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.

This commit is contained in:

John Ericson

2021-01-21 22:44:09 -05:00

parent 77403c1c19

commit 8929989614

37 changed files with 429 additions and 423 deletions

									
										pkgs/applications/virtualization/vpcs/default.nix
									
		+1
		-1
	
												View File
												
				@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

				  buildPhase = ''(

				    cd src

				    ./mk.sh ${stdenv.buildPlatform.platform.kernelArch}

				    ./mk.sh ${stdenv.buildPlatform.linuxArch}

				  )'';

				  installPhase = ''