From a4e921432faa9b375b83e3b719945c451da12424 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 5 Aug 2022 10:49:37 +0000
Subject: [PATCH] crosvm: use cpu arch name to find seccomp files

This matches for both supported platforms, and the package is already
marked incompatible with other processes, so we can simplify here.
---
 .../virtualization/crosvm/default.nix           | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix
index c09d1463b171..b387daf3b370 100644
--- a/pkgs/applications/virtualization/crosvm/default.nix
+++ b/pkgs/applications/virtualization/crosvm/default.nix
@@ -5,14 +5,7 @@
 }:
 
 let
-
   upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json);
-
-  arch = with stdenv.hostPlatform;
-    if isAarch64 then "aarch64"
-    else if isx86_64 then "x86_64"
-    else throw "no seccomp policy files available for host platform";
-
 in
 
 rustPlatform.buildRustPackage rec {
@@ -35,16 +28,18 @@ rustPlatform.buildRustPackage rec {
     libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
   ];
 
+  arch = stdenv.hostPlatform.parsed.cpu.name;
+
   postPatch = ''
     cp ${./Cargo.lock} Cargo.lock
-    sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/${arch}/|g" \
-        seccomp/${arch}/*.policy
+    sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/$arch/|g" \
+        seccomp/$arch/*.policy
   '';
 
   preBuild = ''
     export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy
 
-    for policy in seccomp/${arch}/*.policy; do
+    for policy in seccomp/$arch/*.policy; do
         compile_seccomp_policy \
             --default-action trap $policy ''${policy%.policy}.bpf
     done
@@ -54,7 +49,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     mkdir -p $out/share/policy/
-    cp -v seccomp/${arch}/*.bpf $out/share/policy/
+    cp -v seccomp/$arch/*.bpf $out/share/policy/
   '';
 
   CROSVM_CARGO_TEST_KERNEL_BINARY =