diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 20:33:55 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-23 10:01:28 -0500 |
| commit | 9c213398b312e0f0bb9cdf05090fd20223a82ad0 (patch) | |
| tree | c645a940abedfc4abf51dbb99ce1a8e871e5e799 /pkgs/applications/virtualization | |
| parent | 2bc16b381e09eeb75deefdf6fd5bdc4771b795f3 (diff) | |
| download | nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.gz nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.bz2 nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.lz nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.xz nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.tar.zst nixlib-9c213398b312e0f0bb9cdf05090fd20223a82ad0.zip | |
lib: Clean up how linux and gcc config is specified
Second attempt of 8929989614589ee3acd070a6409b2b9700c92d65; see that commit for details. This reverts commit 0bc275e63423456d6deb650e146120c39c1e0723.
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 = '' |