From 129d329e3bcdcc972454ce284e17da16b28bd401 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 3 Jun 2021 09:04:34 +0000
Subject: crosvm: fix build

* Add new vhost source dependency
* Drop Cargo.lock patch
* Re-enable test on x86_64 (seems to work fine now)
* Drop syslog patch
* Rebase VIRTIO_NET_F_MAC patch -- I renamed TapFdOptions to
  TapFdOption for consistency with newly-added similar structs.

Message-Id: <20210603091138.24942-4-hi@alyssa.is>
---
 pkgs/os-specific/linux/chromium-os/crosvm/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'pkgs/os-specific/linux/chromium-os/crosvm/default.nix')

diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
index 681526356ea..f8b6b13e694 100644
--- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
+++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix
@@ -11,10 +11,11 @@ let
 
   getSrc = path: fetchFromGitiles upstreamInfo.components.${path};
   srcs = lib.genAttrs [
-    "src/platform/crosvm"
-    "src/third_party/adhd"
     "src/aosp/external/minijail"
+    "src/platform/crosvm"
     "src/platform2"
+    "src/third_party/adhd"
+    "src/third_party/rust-vmm/vhost"
   ] getSrc;
 in
 
@@ -39,14 +40,12 @@ in
 
     sourceRoot = "src/platform/crosvm";
 
-    cargoPatches = [ ./Regenerate-Cargo.lock.patch ];
-
     patches = [
       ./default-seccomp-policy-dir.diff
       ./VIRTIO_NET_F_MAC.patch
     ];
 
-    cargoSha256 = "0rrhgchrf6ac5393rxlkff0kd3xs7xixxshcdpag3lxjgg0j62af";
+    cargoSha256 = "1hw9r7vggvn8p0sy4k0i2ijpyk0yb11qww6s6d6wdfvrl1ksbapl";
 
     nativeBuildInputs = [ pkgconfig wayland ];
 
@@ -55,9 +54,6 @@ in
     postPatch = ''
       sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \
              seccomp/*/*.policy
-
-      # No /dev/log in the sandbox.
-      sed -i '/^[[:space:]]*syslog::init().unwrap();$/d' tests/boot.rs
     '';
 
     preBuild = ''
@@ -69,9 +65,6 @@ in
       cp seccomp/${arch}/* $out/share/policy/
     '';
 
-    # Boot test often hangs on AMD.
-    doCheck = !stdenv.buildPlatform.isx86_64;
-
     CROSVM_CARGO_TEST_KERNEL_BINARY =
       lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform)
         "${linux}/${stdenv.hostPlatform.platform.kernelTarget}";
-- 
cgit 1.4.1