diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2019-04-17 16:25:49 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2019-04-17 17:53:23 +0200 |
| commit | bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a (patch) | |
| tree | 479d6545ac761a86c6f9a011423bd0e2ffd80660 /pkgs/applications/networking/browsers/tor-browser-bundle-bin | |
| parent | 0b3721588e3183b2ec2e74e443f3ca52a24336dd (diff) | |
| download | nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar.gz nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar.bz2 nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar.lz nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar.xz nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.tar.zst nixlib-bce47ea9d5fa962736ddd4a254a27a5fd2cdee9a.zip | |
tor-browser-bundle-bin: defaults for XAUTHORITY and DBUS_SESSION_BUS_ADDRESS
See https://github.com/NixOS/nixpkgs/issues/55082 and https://github.com/NixOS/nixpkgs/issues/20157#issuecomment-272767442
Diffstat (limited to 'pkgs/applications/networking/browsers/tor-browser-bundle-bin')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 283c63dcd6fc..f37677b05213 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -302,10 +302,12 @@ stdenv.mkDerivation rec { # easily generated by firefox at startup. rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json} + # XDG + : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" + : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" + ${optionalString pulseaudioSupport '' # Figure out some envvars for pulseaudio - : "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}" - : "\''${XDG_CONFIG_HOME:=\$REAL_HOME/.config}" : "\''${PULSE_SERVER:=\$XDG_RUNTIME_DIR/pulse/native}" : "\''${PULSE_COOKIE:=\$XDG_CONFIG_HOME/pulse/cookie}" ''} @@ -336,9 +338,9 @@ stdenv.mkDerivation rec { \ TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ - XAUTHORITY="\''${XAUTHORITY:-}" \ + XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ DISPLAY="\$DISPLAY" \ - DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \ + DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ XDG_DATA_DIRS="$WRAPPER_XDG_DATA_DIRS" \ |