colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crosvm: switch back to upstream virglrenderer

Browse Source 
We now have virglrenderer 0.10.0, which includes everything crosvm
needs that wasn't in 0.9.1.
This commit is contained in:
Alyssa Ross 2022-09-04 18:45:55 +00:00
parent c79187f635
commit cb10a5406c
No known key found for this signature in database
GPG Key ID: F9DBED4859B271C0
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/applications/virtualization/crosvm/default.nix
View File

@ -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;