summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2017-06-07 19:04:51 +0200
committerJoachim Fasting <joachifm@fastmail.fm>2017-06-07 19:08:25 +0200
commit5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a (patch)
tree2b7a360d3e20cffd263ca05c9b876da823b59efa /pkgs/applications
parent5365166a5dc65bcd8670ba426a8fd80735f7f591 (diff)
downloadnixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar.gz
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar.bz2
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar.lz
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar.xz
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.tar.zst
nixlib-5b5f3f542a8d62f16ba360dfde42a98c7ee02e1a.zip
tor-browser-bundle-bin: 6.5.2 -> 7.0
Now requires pulseaudio for audio playback.

https://blog.torproject.org/blog/tor-browser-70-released
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 2c9661c36fa5..d8ab6d5d1d15 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -6,7 +6,6 @@
 , zlib
 
 # libxul run-time dependencies
-, alsaLib
 , atk
 , cairo
 , dbus
@@ -16,14 +15,15 @@
 , gdk_pixbuf
 , glib
 , gtk2
+, libxcb
 , libX11
 , libXext
 , libXrender
 , libXt
 , pango
 
-# Pulseaudio support
-, pulseaudioSupport ? mediaSupport
+, audioSupport ? mediaSupport
+, pulseaudioSupport ? audioSupport
 , libpulseaudio
 
 # Media support (implies pulseaudio support)
@@ -43,7 +43,6 @@ with stdenv.lib;
 
 let
   libPath = makeLibraryPath ([
-    alsaLib
     atk
     cairo
     dbus
@@ -53,6 +52,7 @@ let
     gdk_pixbuf
     glib
     gtk2
+    libxcb
     libX11
     libXext
     libXrender
@@ -81,7 +81,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "6.5.2";
+  version = "7.0";
 
   lang = "en-US";
 
@@ -91,7 +91,7 @@ let
         "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 = "1c9aiv4qdpi95yymmj86hkkinvkgbcdsa12vvdh9c18wsh4qrfvn";
     };
 
     "i686-linux" = fetchurl {
@@ -99,7 +99,7 @@ let
         "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 = "1znbywcwlrrl3hbvk4dvq92b00flr8niw2kqk5pwvwwbl1gxiyz0";
     };
   };
 in