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

Merge pull request #32341 from oxij/pkg/tor-browser

Browse Source 
firefoxPackages: tor-browser: 52.3.0esr-7.0.1 -> 52.5.0esr-7.0-1
This commit is contained in:
Jörg Thalheim 2017-12-05 17:32:37 +00:00 committed by GitHub
commit d9487e8941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -29,9 +29,11 @@
# Set to `privacySupport` or `false`. # Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport , webrtcSupport ? !privacySupport
, googleAPISupport ? !privacySupport , geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false , crashreporterSupport ? false
, safeBrowsingSupport ? false
, drmSupport ? false , drmSupport ? false
## other ## other
@ -141,7 +143,7 @@ stdenv.mkDerivation (rec {
] ]
# and wants these # and wants these
++ lib.optionals isTorBrowserLike [ ++ lib.optionals isTorBrowserLike ([
"--with-tor-browser-version=${version}" "--with-tor-browser-version=${version}"
"--enable-signmar" "--enable-signmar"
"--enable-verify-mar" "--enable-verify-mar"
@ -151,7 +153,9 @@ stdenv.mkDerivation (rec {
# possibilities on other platforms. # possibilities on other platforms.
# Lets save some space instead. # Lets save some space instead.
"--with-system-nspr" "--with-system-nspr"
] ] ++ flag geolocationSupport "mozril-geoloc"
++ flag safeBrowsingSupport "safe-browsing"
)
++ flag alsaSupport "alsa" ++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio" ++ flag pulseaudioSupport "pulseaudio"

7
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -109,7 +109,7 @@ in rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SLNOS"; owner = "SLNOS";
repo = "tor-browser"; repo = "tor-browser";
# branch "tor-browser-45.8.0esr-6.5-2" # branch "tor-browser-45.8.0esr-6.5-2-slnos"
rev = "e4140ea01b9906934f0347e95f860cec207ea824"; rev = "e4140ea01b9906934f0347e95f860cec207ea824";
sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60"; sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
}; };
@ -128,8 +128,9 @@ in rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SLNOS"; owner = "SLNOS";
repo = "tor-browser"; repo = "tor-browser";
rev = "tor-browser-52.3.0esr-7.0-1-slnos"; # branch "tor-browser-52.5.0esr-7.0-1-slnos";
sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv"; rev = "830ff8d622ef20345d83f386174f790b0fc2440d";
sha256 = "169mjkr0bp80yv9nzza7kay7y2k03lpnx71h4ybcv9ygxgzdgax5";
}; };
patches = patches =