From 4837b70d27399137ac2f48e3cb91a379786c5ef4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Dec 2010 17:07:07 +0000
Subject: [PATCH] * Restore MPlayer's default font.  This got lost somewhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25260
---
 pkgs/applications/video/MPlayer/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/MPlayer/default.nix b/pkgs/applications/video/MPlayer/default.nix
index 47c68df1ba3..2eca645ed9c 100644
--- a/pkgs/applications/video/MPlayer/default.nix
+++ b/pkgs/applications/video/MPlayer/default.nix
@@ -12,7 +12,7 @@
 , lameSupport ? true, lame ? null
 , screenSaverSupport ? true, libXScrnSaver
 , pulseSupport ? false, pulseaudio
-, mesa, pkgconfig, unzip, yasm
+, mesa, pkgconfig, unzip, yasm, freefont_ttf
 }:
 
 assert alsaSupport -> alsaLib != null;
@@ -104,6 +104,13 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = if x11Support then "-lX11 -lXext" else "";
 
+  # Provide a reasonable standard font.  Maybe we should symlink here.
+  postInstall =
+    ''
+      mkdir -p $out/share/mplayer
+      cp ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mplayer/subfont.ttf
+    '';
+
   crossAttrs = {
     preConfigure = ''
       configureFlags="`echo $configureFlags |