at master 1.2 kB view raw
1diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py 2index 970d5dd..5d3c0b7 100644 3--- a/libmat2/bubblewrap.py 4+++ b/libmat2/bubblewrap.py 5@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError 6 7 8 def _get_bwrap_path() -> str: 9- which_path = shutil.which('bwrap') 10- if which_path: 11- return which_path 12- 13- raise RuntimeError("Unable to find bwrap") # pragma: no cover 14+ return '@bwrap@' 15 16 17 def _get_bwrap_args(tempdir: str, 18@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str, 19 20 # XXX: use --ro-bind-try once all supported platforms 21 # have a bubblewrap recent enough to support it. 22- ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd] 23+ ro_bind_dirs = ['/nix/store', cwd] 24 for bind_dir in ro_bind_dirs: 25 if os.path.isdir(bind_dir): # pragma: no cover 26 ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir]) 27 28- ro_bind_files = ['/etc/ld.so.cache'] 29- for bind_file in ro_bind_files: 30- if os.path.isfile(bind_file): # pragma: no cover 31- ro_bind_args.extend(['--ro-bind', bind_file, bind_file]) 32- 33 args = ro_bind_args + \ 34 ['--dev', '/dev', 35 '--proc', '/proc',