clan/clan-core
12
4
Fork 19
Code Issues 108 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/clan-cli/clan_cli/zerotier/__init__.py
View File

@ -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:

4
pkgs/clan-cli/default.nix
View File

@ -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