simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

bwrap-helper: Include user bus

Browse source
This commit is contained in:
Simon Bruder 2023-12-13 14:16:54 +01:00
parent 6b9e98fdd3
commit 37219a1dd1
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/bwrap-helper/bwrap-helper.py
View file

@ -183,6 +183,7 @@ argument_groups = {
False, False,
[ [
*ro_bind("/run/dbus/system_bus_socket"), *ro_bind("/run/dbus/system_bus_socket"),
*ro_bind(f"/run/user/{uid}/bus"),
*ro_bind(generate_tmp_file("machine-id", "0" * 32), "/etc/machine-id"), *ro_bind(generate_tmp_file("machine-id", "0" * 32), "/etc/machine-id"),
], ],
), ),
@ -218,7 +219,7 @@ passthrough_args = [
("symlink", 2), ("symlink", 2),
] ]
for (_, arguments) in argument_groups.values(): for _, arguments in argument_groups.values():
for argument in arguments: for argument in arguments:
assert type(argument) == str assert type(argument) == str
@ -229,7 +230,7 @@ for name, (default, _) in argument_groups.items():
parser.add_argument("program") parser.add_argument("program")
parser.add_argument("args", nargs="*") parser.add_argument("args", nargs="*")
for (arg, nargs) in passthrough_args: for arg, nargs in passthrough_args:
parse_passthrough_arg(arg, nargs) parse_passthrough_arg(arg, nargs)
args = parser.parse_args() args = parser.parse_args()
@ -240,7 +241,7 @@ for name, (_, arguments) in argument_groups.items():
if getattr(args, name): if getattr(args, name):
assembled_args.extend(arguments) assembled_args.extend(arguments)
for (arg, _) in passthrough_args: for arg, _ in passthrough_args:
assemble_passthrough_arg(arg) assemble_passthrough_arg(arg)
if args.show_cmdline: if args.show_cmdline: