diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-06 02:06:35 +0300 |
|---|---|---|
| committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2015-10-06 02:06:35 +0300 |
| commit | 01df2bba0474c8cfb9af54e57baa0bff5defd034 (patch) | |
| tree | c07b9e0bffef452b35c5b477e8b66de842ecb183 | |
| parent | b3796cd0e7329fce098b5bb46b63ce7678f99288 (diff) | |
| parent | e1ca9303d2cd25d3ed6c9d72e05dcc9a0c16ba8d (diff) | |
| download | nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar.gz nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar.bz2 nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar.lz nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar.xz nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.tar.zst nixlib-01df2bba0474c8cfb9af54e57baa0bff5defd034.zip | |
Merge pull request #10206 from joachifm/torbrowser-5
torbrowser: 4.5.3 -> 5.0.3
| -rw-r--r-- | pkgs/tools/security/tor/torbrowser.nix | 16 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index bd7531af18f7..6e8f638c8b0e 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -2,9 +2,6 @@ , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib}: let - bits = if stdenv.system == "x86_64-linux" then "64" - else "32"; - # isolated tor environment torEnv = buildEnv { name = "tor-env"; @@ -15,18 +12,17 @@ let ]; }; - ldLibraryPath = if bits == "64" then torEnv+"/lib:"+torEnv+"/lib64" - else torEnv+"/lib"; + ldLibraryPath = ''${torEnv}/lib${stdenv.lib.optionalString stdenv.is64bit ":${torEnv}/lib64"}''; in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.5.3"; + version = "5.0.3"; 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 - "24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else - "154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f"; + 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 + "1lqsiidnlrh0dlwzc93d0vbjclkb1zq3mwfcjxadjpwik6afszsb" else + "1ajn1bw1j63h3yblh06mmp7xhwdhqg9pdkxyz1dqj1rsp264k50f"; }; patchPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5fa4d3616ab..07afaa6587bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3172,7 +3172,9 @@ let 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 { }; |