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

tor-browser-bundle: improve organization of distribution dir

Browse Source 
Store TBB specific files under TorBrowser-Data
This commit is contained in:
Joachim Fasting 2017-09-26 20:31:27 +02:00
parent 346661d77b
commit 0c26be5bd2
No known key found for this signature in database
GPG Key ID: 66EAB6B14F6B6E0D
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
View File

@ -181,10 +181,13 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
TBBUILD=${tor-browser-build_src}/projects/tor-browser TBBUILD=${tor-browser-build_src}/projects/tor-browser
TBDATA_PATH=TorBrowser-Data
self=$out/lib/tor-browser self=$out/lib/tor-browser
mkdir -p $self && cd $self mkdir -p $self && cd $self
TBDATA_IN_STORE=$self/$TBDATA_PATH
cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* . cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* .
chmod -R +w . chmod -R +w .
@ -207,7 +210,7 @@ stdenv.mkDerivation rec {
// Where to find the Nixpkgs tor executable & config // Where to find the Nixpkgs tor executable & config
lockPref("extensions.torlauncher.tor_path", "${tor}/bin/tor"); lockPref("extensions.torlauncher.tor_path", "${tor}/bin/tor");
lockPref("extensions.torlauncher.torrc-defaults_path", "$self/torrc-defaults"); lockPref("extensions.torlauncher.torrc-defaults_path", "$TBDATA_IN_STORE/torrc-defaults");
// Captures store paths // Captures store paths
clearPref("extensions.xpiState"); clearPref("extensions.xpiState");
@ -227,14 +230,15 @@ stdenv.mkDerivation rec {
ln -s -t browser/extensions ${extensionsEnv}"/"* ln -s -t browser/extensions ${extensionsEnv}"/"*
# Copy bundle data # Copy bundle data
cat \ bundlePlatform=linux
$TBBUILD/Bundle-Data/linux/Data/Tor/torrc-defaults \ bundleData=$TBBUILD/Bundle-Data
$TBBUILD/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix \
>> torrc-defaults
mkdir -p $TBDATA_PATH
cat \ cat \
$TBBUILD/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js \ $bundleData/$bundlePlatform/Data/Tor/torrc-defaults \
$TBBUILD/Bundle-Data/PTConfigs/bridge_prefs.js >> defaults/pref/extension-overrides.js \ >> $TBDATA_PATH/torrc-defaults
cat \
$bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
>> defaults/pref/extension-overrides.js >> defaults/pref/extension-overrides.js
# Generate a suitable wrapper # Generate a suitable wrapper