diff options
| author | Artturi <Artturin@artturin.com> | 2022-05-08 13:51:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 13:51:12 +0300 |
| commit | 52f31d531b68d92f901310ea3a48999ac182df73 (patch) | |
| tree | 5d26b8273dcaf4163fa549713a7c45fe76aa4487 /pkgs | |
| parent | 3c8e6248cbb4b400c1b2b79d523e4b02b9a7ca40 (diff) | |
| parent | af3565ce64fa629f520d6d6c8c2435e28713ca05 (diff) | |
Merge pull request #171820 from Artturin/torbrow1
tor-browser-bundle-bin: fix unbound variables
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix | 14 |
1 files changed, 6 insertions, 8 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 f7f0f0c230bed..9293cc3050d8a 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\$DISPLAY" \ + DISPLAY="\''${DISPLAY:-}" \ DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ @@ -366,10 +366,10 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ - MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \ - WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \ - XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \ - XCURSOR_PATH="\$XCURSOR_PATH" \ + MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ + WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ + XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ + XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ \ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ @@ -409,9 +409,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \ - XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \ - DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + TBB_HOME=$(mktemp -d) \ $out/bin/tor-browser --version >/dev/null ''; |