* Restore MPlayer's default font. This got lost somewhere.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25260
This commit is contained in:
Eelco Dolstra 2010-12-23 17:07:07 +00:00
parent 597ee95f99
commit 4837b70d27

View File

@ -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 |