diff --git a/pkgs/bwrap-helper/bwrap-helper.py b/pkgs/bwrap-helper/bwrap-helper.py index b5e0f95..c45d3ef 100755 --- a/pkgs/bwrap-helper/bwrap-helper.py +++ b/pkgs/bwrap-helper/bwrap-helper.py @@ -5,7 +5,6 @@ import argparse import os import shutil import subprocess -import time def flat_map(f, iterable): @@ -139,8 +138,7 @@ argument_groups = { ]), ]), "dbus": (False, [ - *ro_bind(tmp_file("dbus"), "/run/dbus/system_bus_socket"), - "--unsetenv", "DBUS_SESSION_BUS_ADDRESS", + *ro_bind("/run/dbus/system_bus_socket"), *ro_bind(generate_tmp_file("machine-id", "0" * 32), "/etc/machine-id"), ]), "new-session": (True, [ @@ -202,27 +200,7 @@ if args.show_cmdline: assembled_args.append(args.program) assembled_args.extend(args.args) -children = [] -if args.dbus: - children.append( - subprocess.Popen( - [ - "xdg-dbus-proxy", - os.getenv("DBUS_SESSION_BUS_ADDRESS"), - tmp_file("dbus"), - "--filter" - ], - stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - ) - ) - while not os.path.exists(tmp_file("dbus")): - time.sleep(0.1) - try: subprocess.run(assembled_args) finally: shutil.rmtree(tmp_file(None)) - for child in children: - child.terminate() - child.wait() diff --git a/pkgs/bwrap-helper/default.nix b/pkgs/bwrap-helper/default.nix index a850e32..75de032 100644 --- a/pkgs/bwrap-helper/default.nix +++ b/pkgs/bwrap-helper/default.nix @@ -1,4 +1,4 @@ -{ bubblewrap, lib, makeWrapper, python3, stdenvNoCC, xdg-dbus-proxy }: +{ bubblewrap, lib, makeWrapper, python3, stdenvNoCC }: stdenvNoCC.mkDerivation rec { name = "bwrap-helper"; @@ -11,7 +11,6 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ bubblewrap python3 - xdg-dbus-proxy ]; dontUnpack = true;