diff options
Diffstat (limited to 'pkgs/applications/virtualization/crosvm/default.nix')
| -rw-r--r-- | pkgs/applications/virtualization/crosvm/default.nix | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 50c5a10b5663a..d2fda361660e7 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,22 +1,32 @@ -{ lib, rustPlatform, fetchgit +{ lib, rustPlatform, fetchgit, fetchpatch , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols +, pkgsCross }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "124.0"; + version = "125.0"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "bc2900b9ccbdf37b780a63888ca94437fd7dd6af"; - hash = "sha256-t/47u5BlSC5vbRc7OQSbGBF+wnhcDFOMjrRQc/p2HcQ="; + rev = "6a7ff1ecb7fad6820d3bbfe8b11e65854059aba5"; + hash = "sha256-y/vHU8i9YNbzSHla853z/2w914mVMFOryyaHE1uxlvM="; fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "musl.patch"; + url = "https://chromium.googlesource.com/chromiumos/platform/crosvm/+/128e591037c0be0362ed814d0b5583aa65ff09e1%5E%21/?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-p5VzHRb0l0vCJNe48cRl/uBYHwTQMEykMcBOMzL3yaY="; + }) + ]; + separateDebugInfo = true; - cargoHash = "sha256-7zx0k7HXequpwcURHx+Ml3cDhdvLkXTg+V71F6TO/d0="; + cargoHash = "sha256-1AUfd9dhIZvVVUsVbnGoLKc0lBfccwM4wqWgU4yZWOE="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner @@ -35,10 +45,15 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "virgl_renderer" ]; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + tests = { + musl = pkgsCross.musl64.crosvm; + }; + }; meta = with lib; { - description = "A secure virtual machine monitor for KVM"; + description = "Secure virtual machine monitor for KVM"; homepage = "https://crosvm.dev/"; mainProgram = "crosvm"; maintainers = with maintainers; [ qyliss ]; |