BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crosvm: use cpu arch name to find seccomp files

Browse source 
This matches for both supported platforms, and the package is already
marked incompatible with other processes, so we can simplify here.
This commit is contained in:
Alyssa Ross 2022-08-05 10:49:37 +00:00
parent de662ab315
commit a4e921432f
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/virtualization/crosvm/default.nix
View file

@ -5,14 +5,7 @@
}: }:
let let
upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json); 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 in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -35,16 +28,18 @@ rustPlatform.buildRustPackage rec {
libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols
]; ];
arch = stdenv.hostPlatform.parsed.cpu.name;
postPatch = '' postPatch = ''
cp ${./Cargo.lock} Cargo.lock cp ${./Cargo.lock} Cargo.lock
sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/${arch}/|g" \ sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/$arch/|g" \
seccomp/${arch}/*.policy seccomp/$arch/*.policy
''; '';
preBuild = '' preBuild = ''
export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy 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 \ compile_seccomp_policy \
--default-action trap $policy ''${policy%.policy}.bpf --default-action trap $policy ''${policy%.policy}.bpf
done done
@ -54,7 +49,7 @@ rustPlatform.buildRustPackage rec {
postInstall = '' postInstall = ''
mkdir -p $out/share/policy/ 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 = CROSVM_CARGO_TEST_KERNEL_BINARY =