diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-22 14:07:06 -0800 |
commit | 0bc275e63423456d6deb650e146120c39c1e0723 (patch) | |
tree | 1d33aa707b24fa58952162457e243c731836f99b /pkgs/applications/virtualization | |
parent | 2e5475381b65290e08d357fa1434bd28d0c21cfa (diff) | |
download | nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.gz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.bz2 nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.lz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.xz nixlib-0bc275e63423456d6deb650e146120c39c1e0723.tar.zst nixlib-0bc275e63423456d6deb650e146120c39c1e0723.zip |
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 8929989614589ee3acd070a6409b2b9700c92d65.
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 848b93a5381c..3ad540e53072 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.linux-kernel.target}"; + "${linux}/${stdenv.hostPlatform.platform.kernelTarget}"; passthru = { inherit adhdSrc; diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix index 8c41a1f4c274..33d707a50079 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.linuxArch} + ./mk.sh ${stdenv.buildPlatform.platform.kernelArch} )''; installPhase = '' |