Merge pull request #110544 from Ericson2314/no-platform

top-level, lib: Remove platform attribute of platforms
2021-01-23 16:32:36 -05:00
parent 10bb072072 2dde58903e
commit 12881a7aa7
40 changed files with 464 additions and 468 deletions
--- 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;
--- 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 = ''