Commit 00f1b94d authored by Alyssa Ross's avatar Alyssa Ross Committed by Adam Joseph
Browse files

crosvm: backport page size fix for tests 

The version of crosvm we have packaged only passes its tests with 4K
pages.

The whole patch doesn't apply, but that's okay, because we don't run
most of the affected tests.
parent d20c21c8

pkgs/applications/virtualization/crosvm/default.nix

+12 −1
Original line number Diff line number Diff line 
{ lib, rustPlatform, fetchgit, pkg-config, protobuf, python3, wayland-scanner

{ lib, rustPlatform, fetchgit, fetchpatch

, pkg-config, protobuf, python3, wayland-scanner

, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols

}:
@@ -13,6 +14,16 @@ rustPlatform.buildRustPackage rec { 
    fetchSubmodules = true;

  };



  patches = [

    (fetchpatch {

      name = "test-page-size-fix.patch";

      url = "https://chromium.googlesource.com/crosvm/crosvm/+/d9bc6e99ff5ac31d7d88b684c938af01a0872fc1%5E%21/?format=TEXT";

      decode = "base64 -d";

      includes = [ "src/crosvm/config.rs" ];

      hash = "sha256-3gfNzp0WhtNr+8CWSISCJau208EMIo3RJhM+4SyeV3o=";

    })

  ];



  separateDebugInfo = true;



  cargoHash = "sha256-yRujLgPaoKx/wkG3yMwQ5ndy9X5xDWSKtCr8DypXvEA=";