public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

torbrowser: wrapper improvements

Browse Source 
This brings the wrapper closer to the upstream wrapper.

Briefly,
- exec to prevent the shell from hanging around
- do not connect to session manager
- set WM_CLASS to "Tor Browser"
- use fonts.conf from the torbrowser bundle
This commit is contained in:
Joachim Fasting 2016-04-29 18:42:09 +02:00
parent 85aece2f8e
commit c3f54960c6
No known key found for this signature in database
GPG Key ID: 4330820E1E04DCF4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/security/tor/torbrowser.nix
View File

@ -51,14 +51,16 @@ stdenv.mkDerivation rec {
cat > "$out/bin/tor-browser" << EOF cat > "$out/bin/tor-browser" << EOF
#! ${stdenv.shell} #! ${stdenv.shell}
unset SESSION_MANAGER
export HOME="\$HOME/.torbrowser4" export HOME="\$HOME/.torbrowser4"
if [ ! -d \$HOME ]; then if [ ! -d \$HOME ]; then
mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME
echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \
~/Data/Browser/profile.default/preferences/extension-overrides.js ~/Data/Browser/profile.default/preferences/extension-overrides.js
fi fi
export FONTCONFIG_PATH=\$HOME/Data/fontconfig
export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
$out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "\$@" exec $out/share/tor-browser/Browser/firefox --class "Tor Browser" -no-remote -profile ~/Data/Browser/profile.default "\$@"
EOF EOF
chmod +x $out/bin/tor-browser chmod +x $out/bin/tor-browser