diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-09-04 18:45:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2022-09-04 18:45:55 +0000 |
commit | cb10a5406c9c73274434603c1c18e176051d448d (patch) | |
tree | c8bcea8cadaa376fba12b09b67dffccc965d2af7 /pkgs/applications/virtualization | |
parent | c79187f635edf075b42100f0597b652760cfbf17 (diff) |
crosvm: switch back to upstream virglrenderer
We now have virglrenderer 0.10.0, which includes everything crosvm needs that wasn't in 0.9.1.
Diffstat (limited to 'pkgs/applications/virtualization')
-rw-r--r-- | pkgs/applications/virtualization/crosvm/default.nix | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index bd2c8badce542..a4de1433ae735 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -3,7 +3,10 @@ , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: -let +rustPlatform.buildRustPackage rec { + pname = "crosvm"; + version = "104.0"; + src = fetchgit { url = "https://chromium.googlesource.com/crosvm/crosvm"; rev = "265aab613b1eb31598ea0826f04810d9f010a2c6"; @@ -11,18 +14,6 @@ let fetchSubmodules = true; }; - # use vendored virglrenderer - virglrenderer' = virglrenderer.overrideAttrs (oa: { - src = "${src}/third_party/virglrenderer"; - }); -in - -rustPlatform.buildRustPackage rec { - pname = "crosvm"; - version = "104.0"; - - inherit src; - separateDebugInfo = true; patches = [ @@ -34,7 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ minijail-tools pkg-config protobuf wayland-scanner ]; buildInputs = [ - libcap libdrm libepoxy minijail virglrenderer' wayland wayland-protocols + libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols ]; arch = stdenv.hostPlatform.parsed.cpu.name; |