diff options
Diffstat (limited to 'pkgs/tools/security/tor/torbrowser.nix')
-rw-r--r-- | pkgs/tools/security/tor/torbrowser.nix | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index f220a46bddc..b91dc65219b 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -9,7 +9,7 @@ let torEnv = buildEnv { name = "tor-env"; paths = [ - stdenv.gcc.gcc 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 xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXt ]; @@ -20,18 +20,18 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "3.6.2"; + version = "4.0.6"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "1rfv59k9mia6hr1z1k4im20dy59ir7i054cgf78sfj1zsh08q7hf" else - "1klkk1k5r51pcx44r1z3sw08fqcl2f2v5iblf4yh83js482c37r8"; + "d954510bf812f624945bdba8e1c37e23573de89e2f159d7c89a3e3589a765559" else + "89ce71312f5d73fc2af637a93d7697587b2132fce0e9f6e815b25ddba66518d0"; }; patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Tor/tor + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor ''; doCheck = true; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { echo "Checking firefox..." LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." - LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null + LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null ''; installPhase = '' @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { cp -R * $out/share/tor-browser cat > "$out/bin/tor-browser" << EOF - export HOME="\$HOME/.torbrowser" + export HOME="\$HOME/.torbrowser4" if [ ! -d \$HOME ]; then - mkdir -p \$HOME && cp -R $out/share/tor-browser/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/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -64,10 +64,11 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv ]; - meta = with stdenv.lib; { - description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; - homepage = https://www.torproject.org/; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline maintainers.matejc ]; + meta = { + description = "Tor Browser Bundle"; + homepage = https://www.torproject.org/; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; + [ offline matejc doublec thoughtpolice ]; }; } |