replace bubblewrap with fakeroot
this restores macOS support.
This commit is contained in:
parent
677494811b
commit
7eab8c22cf
@ -107,26 +107,13 @@ def zerotier_controller() -> Iterator[ZerotierController]:
|
|||||||
home = tempdir / "zerotier-one"
|
home = tempdir / "zerotier-one"
|
||||||
home.mkdir()
|
home.mkdir()
|
||||||
cmd = nix_shell(
|
cmd = nix_shell(
|
||||||
["bubblewrap"],
|
["fakeroot"],
|
||||||
[
|
[
|
||||||
"bwrap",
|
"fakeroot",
|
||||||
"--proc",
|
"--",
|
||||||
"/proc",
|
|
||||||
"--dev",
|
|
||||||
"/dev",
|
|
||||||
"--unshare-user",
|
|
||||||
"--uid",
|
|
||||||
"0",
|
|
||||||
"--gid",
|
|
||||||
"0",
|
|
||||||
"--ro-bind",
|
|
||||||
"/nix",
|
|
||||||
"/nix",
|
|
||||||
"--bind",
|
|
||||||
str(home),
|
|
||||||
"/var/lib/zerotier-one",
|
|
||||||
zerotier_exe,
|
zerotier_exe,
|
||||||
f"-p{controller_port}",
|
f"-p{controller_port}",
|
||||||
|
str(home),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
with subprocess.Popen(cmd) as p:
|
with subprocess.Popen(cmd) as p:
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
, argcomplete
|
, argcomplete
|
||||||
, fastapi
|
, fastapi
|
||||||
, uvicorn
|
, uvicorn
|
||||||
, bubblewrap
|
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, nix
|
, nix
|
||||||
, openssh
|
, openssh
|
||||||
@ -18,6 +17,7 @@
|
|||||||
, stdenv
|
, stdenv
|
||||||
, wheel
|
, wheel
|
||||||
, zerotierone
|
, zerotierone
|
||||||
|
, fakeroot
|
||||||
, rsync
|
, rsync
|
||||||
, ui-assets
|
, ui-assets
|
||||||
, bash
|
, bash
|
||||||
@ -52,7 +52,7 @@ let
|
|||||||
bash
|
bash
|
||||||
nix
|
nix
|
||||||
zerotierone
|
zerotierone
|
||||||
bubblewrap
|
fakeroot
|
||||||
openssh
|
openssh
|
||||||
sshpass
|
sshpass
|
||||||
zbar
|
zbar
|
||||||
|
Loading…
Reference in New Issue
Block a user