tor-browser-bundle-bin: additional download urls

To better support users that are unable to access the official Tor
distribution site, e.g., https://github.com/NixOS/nixpkgs/issues/26184
This commit is contained in:
Joachim Fasting 2017-05-28 20:06:19 +02:00
parent 8e507cfdfe
commit 2262f89230
No known key found for this signature in database
GPG key ID: 7544761007FE4E08

View file

@ -87,12 +87,18 @@ let
srcs = { srcs = {
"x86_64-linux" = fetchurl { "x86_64-linux" = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
];
sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r"; sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
}; };
"i686-linux" = fetchurl { "i686-linux" = fetchurl {
url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; urls = [
"https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
"https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
];
sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w"; sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
}; };
}; };
@ -105,6 +111,7 @@ stdenv.mkDerivation rec {
src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "torbrowser"; name = "torbrowser";