pyrox.dev
Merge pull request #205463 from panicgh/tbb
tor-browser-bundle-bin: 11.5.8 -> 12.0.3
authored by
Robert Schütz
and committed by
GitHub
a1970c01
2d84e9d6
+11
-10
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+11
-10
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
···
26
26
, pulseaudioSupport ? mediaSupport
27
27
, libpulseaudio
28
28
, apulse
29
+
, alsa-lib
29
30
30
31
# Media support (implies audio support)
31
32
, mediaSupport ? true
···
57
58
libPath = lib.makeLibraryPath libPkgs;
58
59
59
60
libPkgs = [
61
+
alsa-lib
60
62
atk
61
63
cairo
62
64
dbus
···
85
87
fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ];
86
88
87
89
# Upstream source
88
-
version = "11.5.8";
90
+
version = "12.0.3";
89
91
90
-
lang = "en-US";
92
+
lang = "ALL";
91
93
92
94
srcs = {
93
95
x86_64-linux = fetchurl {
···
97
99
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
98
100
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
99
101
];
100
-
sha256 = "sha256-/KK9oTijk5dEziAwp5966NaM2V4k1mtBjTJq88Ct7N0=";
102
+
hash = "sha256-bOGY/RdwD6O7QIuOiBw7OVnZfpumGGso6hwMJJwN2g0=";
101
103
};
102
104
103
105
i686-linux = fetchurl {
···
107
109
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
108
110
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
109
111
];
110
-
sha256 = "sha256-TGdJ5yIeo0YQ4XSsb9lv3vuW6qEjhFe7KBmkjYO6fAc=";
112
+
hash = "sha256-t1tnEZtiRig2r8GNJpqT+J0XoxCLMyUsI9tX6aa0lYk=";
111
113
};
112
114
};
113
115
in
···
291
293
# TBB will fail if ownership is too permissive
292
294
chmod 0700 "\$HOME/TorBrowser/Data/Tor"
293
295
294
-
# Initialize the browser profile state. Note that the only data
295
-
# copied from the Store payload is the initial bookmark file, which is
296
-
# never updated once created. All other files under user's profile
297
-
# dir are generated by TBB.
296
+
# Initialize the browser profile state.
297
+
# All files under user's profile dir are generated by TBB.
298
298
mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
299
-
cp -u --no-preserve=mode,owner "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/bookmarks.html" \
300
-
"\$HOME/TorBrowser/Data/Browser/profile.default/bookmarks.html"
301
299
302
300
# Clear some files if the last known store path is different from the new one
303
301
: "\''${KNOWN_STORE_PATH:=\$HOME/known-store-path}"
···
324
322
# Font cache files capture store paths; clear them out on the off
325
323
# chance that TBB would continue using old font files.
326
324
rm -rf "\$HOME/.cache/fontconfig"
325
+
326
+
# Workaround a bug in 12.0.X that Tor directories are not cleaned up and tor gets confused where its socket is
327
+
rm -rf \$XDG_RUNTIME_DIR/Tor*
327
328
328
329
# Manually specify data paths (by default TB attempts to create these in the store)
329
330
{