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

Merge pull request #10206 from joachifm/torbrowser-5 

torbrowser: 4.5.3 -> 5.0.3
This commit is contained in:
Arseniy Seroka 2015-10-06 02:06:35 +03:00
parent b3796cd0e7 e1ca9303d2
commit 01df2bba04
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,9 +2,6 @@
, xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
, gdk_pixbuf, cairo, zlib}: , gdk_pixbuf, cairo, zlib}:
let let
bits = if stdenv.system == "x86_64-linux" then "64"
else "32";
# isolated tor environment # isolated tor environment
torEnv = buildEnv { torEnv = buildEnv {
name = "tor-env"; name = "tor-env";
@ -15,18 +12,17 @@ let
]; ];
}; };
ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64" ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}'';
else torEnv+"/lib";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "tor-browser-${version}"; name = "tor-browser-${version}";
version = "4.5.3"; version = "5.0.3";
src = fetchurl { src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
sha256 = if bits == "64" then sha256 = if stdenv.is64bit then
"24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else "1lqsiidnlrh0dlwzc93d0vbjclkb1zq3mwfcjxadjpwik6afszsb" else
"154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f"; "1ajn1bw1j63h3yblh06mmp7xhwdhqg9pdkxyz1dqj1rsp264k50f";
}; };
patchPhase = '' patchPhase = ''

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

@ -3172,7 +3172,9 @@ let
torbutton = callPackage ../tools/security/torbutton { }; torbutton = callPackage ../tools/security/torbutton { };
torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
stdenv = overrideCC stdenv gcc5;
};
touchegg = callPackage ../tools/inputmethods/touchegg { }; touchegg = callPackage ../tools/inputmethods/touchegg { };