about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/crosvm/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2022-08-05 11:42:30 +0000
committerAlyssa Ross <hi@alyssa.is>2022-08-12 07:55:09 +0000
commit290039f8cd769fe0daf073e8e87b9a6a75420a4a (patch)
treee3a1f395fcd3b3a8d3afd29e8ef57a471cc8bc10 /pkgs/applications/virtualization/crosvm/default.nix
parent7f4172608ec8e0d535dd18ef53c3ae94d8281340 (diff)
downloadnixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar.gz
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar.bz2
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar.lz
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar.xz
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.tar.zst
nixlib-290039f8cd769fe0daf073e8e87b9a6a75420a4a.zip
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.
Diffstat (limited to 'pkgs/applications/virtualization/crosvm/default.nix')
-rw-r--r--pkgs/applications/virtualization/crosvm/default.nix13
1 files changed, 7 insertions, 6 deletions
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;