torbrowser: 4.5.3 -> 5.0.3

torbrowser 5.0.3 requires gcc5, otherwise it fails with

   libstdc++.so.6: version `GLIBCXX_3.4.21' not found (required by Browser/firefox)
This commit is contained in:
Joachim Fasting 2015-10-03 15:02:08 +02:00
parent c34cc5d54e
commit e1ca9303d2
2 changed files with 6 additions and 4 deletions

View File

@ -16,13 +16,13 @@ let
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${if stdenv.is64bit then "64" else "32"}-${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 stdenv.is64bit then sha256 = if stdenv.is64bit then
"24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else "1lqsiidnlrh0dlwzc93d0vbjclkb1zq3mwfcjxadjpwik6afszsb" else
"154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f"; "1ajn1bw1j63h3yblh06mmp7xhwdhqg9pdkxyz1dqj1rsp264k50f";
}; };
patchPhase = '' patchPhase = ''

View File

@ -3170,7 +3170,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 { };