Revert "lib: Clean up how linux and gcc config is specified"

This is a stdenv-rebuild, and should not be merged
into master

This reverts commit 8929989614.

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.linux-kernel.target}";
+        "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
 
     passthru = {
       inherit adhdSrc;

pkgs/applications/virtualization/vpcs/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''(
     cd src
-    ./mk.sh ${stdenv.buildPlatform.linuxArch}
+    ./mk.sh ${stdenv.buildPlatform.platform.kernelArch}
   )'';
 
   installPhase = ''