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

Merge pull request #15065 from joachifm/torbrowser-enhancements

Browse Source 
Torbrowser enhancements
This commit is contained in:
Joachim Fasting 2016-04-30 17:42:01 +02:00
commit 9ec677867f
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,21 +1,16 @@
{ stdenv, fetchurl, buildEnv, makeDesktopItem { stdenv, fetchurl, makeDesktopItem
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk
, gdk_pixbuf, cairo, zlib}: , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib
}:
let let
# isolated tor environment libPath = stdenv.lib.makeLibraryPath [
torEnv = buildEnv {
name = "tor-env";
paths = [
stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype
fontconfig gdk_pixbuf cairo xorg.libXrender xorg.libX11 xorg.libXext fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt
xorg.libXt
]; ];
extraOutputsToInstall = [ "lib" "out" ]; in
};
ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}''; stdenv.mkDerivation rec {
in stdenv.mkDerivation rec {
name = "tor-browser-${version}"; name = "tor-browser-${version}";
version = "5.5.5"; version = "5.5.5";
@ -43,12 +38,10 @@ in stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
checkPhase = '' checkPhase = ''
# Just do a simple test if all libraries get loaded by running help on
# firefox and tor
echo "Checking firefox..." echo "Checking firefox..."
LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null LD_LIBRARY_PATH=${libPath} Browser/firefox --help 1> /dev/null
echo "Checking tor..." echo "Checking tor..."
LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null LD_LIBRARY_PATH=${libPath}:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null
''; '';
installPhase = '' installPhase = ''
@ -58,14 +51,16 @@ in 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 LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor export FONTCONFIG_PATH=\$HOME/Data/fontconfig
$out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "\$@" export LD_LIBRARY_PATH=${libPath}:$out/share/tor-browser/Browser/TorBrowser/Tor
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
@ -76,8 +71,6 @@ in stdenv.mkDerivation rec {
cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
''; '';
buildInputs = [ stdenv ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tor Browser Bundle"; description = "Tor Browser Bundle";
homepage = https://www.torproject.org/; homepage = https://www.torproject.org/;

4
pkgs/top-level/all-packages.nix
View File

@ -3462,7 +3462,9 @@ in
torbutton = callPackage ../tools/security/torbutton { }; torbutton = callPackage ../tools/security/torbutton { };
torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
inherit (xorg) libXrender libX11 libXext libXt;
};
touchegg = callPackage ../tools/inputmethods/touchegg { }; touchegg = callPackage ../tools/inputmethods/touchegg { };