mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
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.
This commit is contained in:
parent
c79187f635
commit
cb10a5406c
1 changed files with 5 additions and 14 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue