replace bubblewrap with fakeroot
All checks were successful
checks-impure / test (pull_request) Successful in 8s
checks / test (pull_request) Successful in 1m17s

this restores macOS support.
This commit is contained in:
Jörg Thalheim 2023-09-26 15:32:36 +02:00
parent 677494811b
commit 7eab8c22cf
2 changed files with 6 additions and 19 deletions

View File

@ -107,26 +107,13 @@ def zerotier_controller() -> Iterator[ZerotierController]:
home = tempdir / "zerotier-one"
home.mkdir()
cmd = nix_shell(
["bubblewrap"],
["fakeroot"],
[
"bwrap",
"--proc",
"/proc",
"--dev",
"/dev",
"--unshare-user",
"--uid",
"0",
"--gid",
"0",
"--ro-bind",
"/nix",
"/nix",
"--bind",
str(home),
"/var/lib/zerotier-one",
"fakeroot",
"--",
zerotier_exe,
f"-p{controller_port}",
str(home),
],
)
with subprocess.Popen(cmd) as p:

View File

@ -3,7 +3,6 @@
, argcomplete
, fastapi
, uvicorn
, bubblewrap
, installShellFiles
, nix
, openssh
@ -18,6 +17,7 @@
, stdenv
, wheel
, zerotierone
, fakeroot
, rsync
, ui-assets
, bash
@ -52,7 +52,7 @@ let
bash
nix
zerotierone
bubblewrap
fakeroot
openssh
sshpass
zbar