about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-11-12 00:07:24 +0000
committerGitHub <noreply@github.com>2021-11-12 00:07:24 +0000
commit8addf990da84a2091616d06657b4374e28eaee01 (patch)
treea1ed1d781c79afe8e2a0d3108cebec4242a3f4c2 /pkgs/data
parentd602c931e29416a813111e8815e83fe39d41a7d6 (diff)
parente7f0ed16c47e93456bf3f15985232b552b3dd2fa (diff)
Merge master into haskell-updates
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/fonts/vista-fonts/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index ca2ae302b3ee4..fa8308b8c9720 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -14,11 +14,12 @@ stdenvNoCC.mkDerivation {
   unpackPhase = ''
     cabextract --lowercase --filter ppviewer.cab $src
     cabextract --lowercase --filter '*.TTF' ppviewer.cab
+    cabextract --lowercase --filter '*.TTC' ppviewer.cab
   '';
 
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
+    cp *.ttf *.ttc $out/share/fonts/truetype
 
     # Set up no-op font configs to override any aliases set up by
     # other packages.