From 290039f8cd769fe0daf073e8e87b9a6a75420a4a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 5 Aug 2022 11:42:30 +0000 Subject: crosvm: get rid of upstream-info.json This was important when building crosvm required assembling our own build tree from lots of different repositories, but now that they've moved to submodules, it's overly complicated and needlessly inconsistent with the rest of Nixpkgs. --- pkgs/applications/virtualization/crosvm/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/virtualization/crosvm/default.nix') diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 2611868a0630..2a5a8c0b97c2 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -3,15 +3,16 @@ , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: -let - upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json); -in - rustPlatform.buildRustPackage rec { pname = "crosvm"; - inherit (upstreamInfo) version; + version = "103.3"; - src = fetchgit (builtins.removeAttrs upstreamInfo.src [ "date" "path" ]); + src = fetchgit { + url = "https://chromium.googlesource.com/crosvm/crosvm"; + rev = "e7db3a5cc78ca90ab06aadd5f08bb151090269b6"; + sha256 = "0hyz0mg5fn6hi97awfpxfykgv68m935r037sdf85v3vcwjy5n5ki"; + fetchSubmodules = true; + }; separateDebugInfo = true; -- cgit 1.4.1