diff options
| author | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-26 20:31:27 +0200 |
|---|---|---|
| committer | Joachim Fasting <joachifm@fastmail.fm> | 2017-09-26 23:17:08 +0200 |
| commit | 0c26be5bd2babc22be978a5d3a9d2b69a2b3ce9a (patch) | |
| tree | c0ca08f937166256ffd1d87f128c995b36ea48fe /pkgs/applications/networking/browsers/tor-browser-bundle | |
| parent | 346661d77be29e01a05680fb51ed79049963be33 (diff) | |
tor-browser-bundle: improve organization of distribution dir
Store TBB specific files under TorBrowser-Data
Diffstat (limited to 'pkgs/applications/networking/browsers/tor-browser-bundle')
| -rw-r--r-- | pkgs/applications/networking/browsers/tor-browser-bundle/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 96d9feabc150..8b741e765593 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -181,10 +181,13 @@ stdenv.mkDerivation rec { installPhase = '' TBBUILD=${tor-browser-build_src}/projects/tor-browser + TBDATA_PATH=TorBrowser-Data self=$out/lib/tor-browser mkdir -p $self && cd $self + TBDATA_IN_STORE=$self/$TBDATA_PATH + cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* . chmod -R +w . @@ -207,7 +210,7 @@ stdenv.mkDerivation rec { // Where to find the Nixpkgs tor executable & config 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 clearPref("extensions.xpiState"); @@ -227,14 +230,15 @@ stdenv.mkDerivation rec { ln -s -t browser/extensions ${extensionsEnv}"/"* # Copy bundle data - cat \ - $TBBUILD/Bundle-Data/linux/Data/Tor/torrc-defaults \ - $TBBUILD/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix \ - >> torrc-defaults + bundlePlatform=linux + bundleData=$TBBUILD/Bundle-Data + mkdir -p $TBDATA_PATH + cat \ + $bundleData/$bundlePlatform/Data/Tor/torrc-defaults \ + >> $TBDATA_PATH/torrc-defaults cat \ - $TBBUILD/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js \ - $TBBUILD/Bundle-Data/PTConfigs/bridge_prefs.js >> defaults/pref/extension-overrides.js \ + $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ >> defaults/pref/extension-overrides.js # Generate a suitable wrapper |