From c79187f635edf075b42100f0597b652760cfbf17 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 4 Sep 2022 18:38:24 +0000
Subject: [PATCH 1/2] virglrenderer: 0.9.1 -> 0.10.0

---
 pkgs/development/libraries/virglrenderer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix
index 1fbf94452f76..26be3d85f3ab 100644
--- a/pkgs/development/libraries/virglrenderer/default.nix
+++ b/pkgs/development/libraries/virglrenderer/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   pname = "virglrenderer";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-${version}/virglrenderer-virglrenderer-${version}.tar.bz2";
-    sha256 = "1h76a1ylhh4niq33sa5knx033sr4k2816vibh4m58j54y7qc6346";
+    sha256 = "tMLD6lu1NnKeoQQIzwhMypKdrW5alULod2cdb8+76iM=";
   };
 
   buildInputs = [ libGLU libepoxy libX11 libdrm mesa ];

From cb10a5406c9c73274434603c1c18e176051d448d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 4 Sep 2022 18:45:55 +0000
Subject: [PATCH 2/2] 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.
---
 .../virtualization/crosvm/default.nix         | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index bd2c8badce54..a4de1433ae73 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;