tor-browser-bundle: use fonts from Nixpkgs

This commit is contained in:
Joachim Fasting 2017-09-26 20:34:56 +02:00
parent f05d50f36c
commit fc44e91ad5
No known key found for this signature in database
GPG Key ID: 66EAB6B14F6B6E0D

View File

@ -11,6 +11,9 @@
, coreutils , coreutils
, hicolor_icon_theme , hicolor_icon_theme
, shared_mime_info , shared_mime_info
, noto-fonts
, noto-fonts-emoji
# Extensions, common # Extensions, common
, unzip , unzip
, zip , zip
@ -172,6 +175,13 @@ let
name = "tor-browser-extensions"; name = "tor-browser-extensions";
paths = with firefoxExtensions; [ https-everywhere noscript torbutton tor-launcher ]; 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tor-browser-bundle-${version}"; name = "tor-browser-bundle-${version}";
@ -244,6 +254,11 @@ stdenv.mkDerivation rec {
$bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
>> defaults/pref/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 # Generate a suitable wrapper
wrapper_PATH=${lib.makeBinPath [ coreutils ]} wrapper_PATH=${lib.makeBinPath [ coreutils ]}
wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ wrapper_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [