From fc44e91ad5fabde78aedc2cb3a5f8125f06ec4ee Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 26 Sep 2017 20:34:56 +0200
Subject: [PATCH] tor-browser-bundle: use fonts from Nixpkgs

---
 .../browsers/tor-browser-bundle/default.nix       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
index 73c5dc6b3ee..979aac5b92f 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -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") [