mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 00:12:56 +00:00
tor-browser-bundle: use fonts from Nixpkgs
This commit is contained in:
parent
f05d50f36c
commit
fc44e91ad5
@ -11,6 +11,9 @@
|
||||
, coreutils
|
||||
, hicolor_icon_theme
|
||||
, shared_mime_info
|
||||
, noto-fonts
|
||||
, noto-fonts-emoji
|
||||
|
||||
# Extensions, common
|
||||
, unzip
|
||||
, zip
|
||||
@ -172,6 +175,13 @@ let
|
||||
name = "tor-browser-extensions";
|
||||
paths = with firefoxExtensions; [ https-everywhere noscript torbutton tor-launcher ];
|
||||
};
|
||||
|
||||
fontsEnv = symlinkJoin {
|
||||
name = "tor-browser-fonts";
|
||||
paths = [ noto-fonts noto-fonts-emoji ];
|
||||
};
|
||||
|
||||
fontsDir = "${fontsEnv}/share/fonts";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "tor-browser-bundle-${version}";
|
||||
@ -244,6 +254,11 @@ stdenv.mkDerivation rec {
|
||||
$bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
|
||||
>> defaults/pref/extension-overrides.js
|
||||
|
||||
# Hard-code path to TBB fonts; xref: FONTCONFIG_FILE in the wrapper below
|
||||
sed $bundleData/$bundlePlatform/Data/fontconfig/fonts.conf \
|
||||
-e "s,<dir>fonts</dir>,<dir>${fontsDir}</dir>," \
|
||||
> $TBDATA_PATH/fonts.conf
|
||||
|
||||
# Generate a suitable wrapper
|
||||
wrapper_PATH=${lib.makeBinPath [ coreutils ]}
|
||||
wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [
|
||||
|
Loading…
Reference in New Issue
Block a user